diff options
| author | Paul Brook <paul@codesourcery.com> | 2006-03-15 20:34:17 +0000 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2006-03-15 20:34:17 +0000 |
| commit | fc858e48c0d09c6f266c530ab6d2fe009a886797 (patch) | |
| tree | 81b1dd5fa35258bf76e5d161fb745df9953b64b5 | |
| parent | f42c4dbb3f699a60c335d0f8bb1df17988316e0e (diff) | |
Merge from branches/csl/sourcerygxx-4_1 revision 112100.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/csl/arm-4_1@112101 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog.csl | 9 | ||||
| -rw-r--r-- | gcc/config/arm/arm.c | 13 |
2 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 2036d772fc8..e036476861d 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,12 @@ +2006-03-15 Paul Brook <paul@codesourcery.com> + + Backport from mainline. + * gcc/config/arm/arm.c (minipool_pad): New. + (add_minipool_forward_ref): Unclude pool alignment padding in address + calculation. + (push_minipool_fix): Set minipool_pad. + (minipool_pad): Ditto. + 2006-03-14 Paul Brook <paul@codesourcery.com> * doc/install.texi: Docuemnt --with-mode. diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 8b7390944a2..84053afdf89 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -7561,6 +7561,7 @@ struct minipool_fixup static Mnode * minipool_vector_head; static Mnode * minipool_vector_tail; static rtx minipool_vector_label; +static int minipool_pad; /* The linked list of all minipool fixes required for this function. */ Mfix * minipool_fix_head; @@ -7676,7 +7677,7 @@ add_minipool_forward_ref (Mfix *fix) /* If set, max_mp is the first pool_entry that has a lower constraint than the one we are trying to add. */ Mnode * max_mp = NULL; - HOST_WIDE_INT max_address = fix->address + fix->forwards; + HOST_WIDE_INT max_address = fix->address + fix->forwards - minipool_pad; Mnode * mp; /* If this fix's address is greater than the address of the first @@ -8254,12 +8255,11 @@ push_minipool_fix (rtx insn, HOST_WIDE_INT address, rtx *loc, to generate duff assembly code. */ gcc_assert (fix->forwards || fix->backwards); - /* With AAPCS/iWMMXt enabled, the pool is aligned to an 8-byte boundary. - So there might be an empty word before the start of the pool. - Hence we reduce the forward range by 4 to allow for this - possibility. */ + /* If an entry requires 8-byte alignment then assume all constant pools + require 4 bytes of padding. Trying to do this later on a per-pool + basis is awkward becuse existing pool entries have to be modified. */ if (ARM_DOUBLEWORD_ALIGN && fix->fix_size == 8) - fix->forwards -= 4; + minipool_pad = 4; if (dump_file) { @@ -8436,6 +8436,7 @@ arm_reorg (void) scan it properly. */ insn = get_insns (); gcc_assert (GET_CODE (insn) == NOTE); + minipool_pad = 0; /* Scan all the insns and record the operands that will need fixing. */ for (insn = next_nonnote_insn (insn); insn; insn = next_nonnote_insn (insn)) |