Patchwork [aarch64-4.7,committed] Fix Bad backport of Refactor thunks code generation.

login
register
mail settings
Submitter James Greenhalgh
Date Nov. 21, 2012, 10:55 a.m.
Message ID <1353495325-5349-1-git-send-email-james.greenhalgh@arm.com>
Download mbox | patch
Permalink /patch/200643/
State New
Headers show

Comments

James Greenhalgh - Nov. 21, 2012, 10:55 a.m.
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.
Richard Earnshaw - Nov. 21, 2012, 11:05 a.m.
On 21/11/12 10:55, James Greenhalgh wrote:
> 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.
>
>

OK.

R.
Marcus Shawcroft - Nov. 21, 2012, 12:38 p.m.
> Today I have fixed that by committing, as revision 193689, the patch
> below as obvious.


On the ARM/aarch64-4.7-branch the ChangeLog entry should be in
ChangeLog.aarch64 rather than ChangeLog.  Please move the entry.

Cheers
/Marcus
James Greenhalgh - Nov. 21, 2012, 2:12 p.m.
> On the ARM/aarch64-4.7-branch the ChangeLog entry should be in
> ChangeLog.aarch64 rather than ChangeLog.  Please move the entry.

Hi Marcus,

Sorry about that.

I've committed this fix moving all the ChangeLog entries I added in the
past two days to their correct place as revision 193696. Hopefully
now everything is OK again.

James

Patch

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);