From febd3244c47ba81b5cc17151c324d5cc974e5ca2 Mon Sep 17 00:00:00 2001 From: Kyrylo Tkachov Date: Tue, 11 Nov 2014 15:29:21 +0000 Subject: [PATCH] [AArch64] Properly guard CUMULATIVE_ARGS definition and remove 'enum' from machine_mode in aarch64.h * config/aarch64/aarch64.h (MACHMODE): Remove 'enum' keyword. (CUMULATIVE_ARGS): Guard on !defined(USED_FOR_TARGET). From-SVN: r217358 --- gcc/ChangeLog | 5 +++++ gcc/config/aarch64/aarch64.h | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 23e6e90984e..432a9fefcf5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-11-11 Kyrylo Tkachov + + * config/aarch64/aarch64.h (MACHMODE): Remove 'enum' keyword. + (CUMULATIVE_ARGS): Guard on !defined(USED_FOR_TARGET). + 2014-11-11 Richard Biener * tree-core.h (pedantic_lvalues): Remove. diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h index 1a6e909986e..99ff7cee745 100644 --- a/gcc/config/aarch64/aarch64.h +++ b/gcc/config/aarch64/aarch64.h @@ -619,10 +619,10 @@ enum arm_pcs #define MACHMODE int #else #include "insn-modes.h" -#define MACHMODE enum machine_mode +#define MACHMODE machine_mode #endif - +#ifndef USED_FOR_TARGET /* AAPCS related state tracking. */ typedef struct { @@ -643,6 +643,7 @@ typedef struct int aapcs_stack_size; /* The total size (in words, per 8 byte) of the stack arg area so far. */ } CUMULATIVE_ARGS; +#endif #define FUNCTION_ARG_PADDING(MODE, TYPE) \ (aarch64_pad_arg_upward (MODE, TYPE) ? upward : downward) -- 2.30.2