This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[aarch64-4.7][committed] Fix Bad backport of Refactor thunks code generation.
- From: James Greenhalgh <james dot greenhalgh at arm dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: marcus dot shawcroft at arm dot com
- Date: Wed, 21 Nov 2012 10:55:25 +0000
- Subject: [aarch64-4.7][committed] Fix Bad backport of Refactor thunks code generation.
Hi,
Yesterday I committed a backport of this patch
http://gcc.gnu.org/ml/gcc-patches/2012-11/msg01398.html
which prevented aarch64-4.7 building due to a difference in how many
arguments plus_constant takes between trunk and 4.7.
Today I have fixed that by committing, as revision 193689, the patch
below as obvious.
Thanks (and sorry!),
James Greenhalgh
---
gcc/
2012-11-21 James Greenhalgh <james.greenhalgh@arm.com>
* config/aarch64/aarch64.c
(aarch64_output_mi_thunk): Use 4.7 API for plus_constant.
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c
index e121fd4..6da4db4 100644
--- a/gcc/config/aarch64/aarch64.c
+++ b/gcc/config/aarch64/aarch64.c
@@ -2286,7 +2286,7 @@ aarch64_output_mi_thunk (FILE *file, tree thunk ATTRIBUTE_UNUSED,
{
if (delta >= -256 && delta < 256)
addr = gen_rtx_PRE_MODIFY (Pmode, this_rtx,
- plus_constant (Pmode, this_rtx, delta));
+ plus_constant (this_rtx, delta));
else
aarch64_add_constant (file, this_regno, IP1_REGNUM, delta);
}
@@ -2294,7 +2294,7 @@ aarch64_output_mi_thunk (FILE *file, tree thunk ATTRIBUTE_UNUSED,
aarch64_emit_move (temp0, gen_rtx_MEM (Pmode, addr));
if (vcall_offset >= -256 && vcall_offset < 32768)
- addr = plus_constant (Pmode, temp0, vcall_offset);
+ addr = plus_constant (temp0, vcall_offset);
else
{
aarch64_build_constant (file, IP1_REGNUM, vcall_offset);