[AArch64] Properly guard CUMULATIVE_ARGS definition and remove 'enum' from machine_mo...

	* config/aarch64/aarch64.h (MACHMODE): Remove 'enum' keyword.
	(CUMULATIVE_ARGS): Guard on !defined(USED_FOR_TARGET).

From-SVN: r217358

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 23e6e90984e63dd382fc394033c7967d37d42315..432a9fefcf509cd1131d701dbb782ebb7e55a2ac 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-11  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
+
+       * config/aarch64/aarch64.h (MACHMODE): Remove 'enum' keyword.
+       (CUMULATIVE_ARGS): Guard on !defined(USED_FOR_TARGET).
+
 2014-11-11  Richard Biener  <rguenther@suse.de>
 
        * tree-core.h (pedantic_lvalues): Remove.

diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
index 1a6e909986e006faad7e0da9e941262b4cc8ac18..99ff7cee745b294d3e2e1c85522a18d89cd22173 100644 (file)
--- 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)