Hi all,

Following up from https://gcc.gnu.org/ml/gcc-patches/2014-10/msg03153.html this fixes up the aarch64 port accordingly to guard CUMULATIVE_ARGS properly so that we can remove the enum keyword from machine_mode.

Building aarch64-none-elf succeeds (after reverting my previous patch).

Ok for trunk?

Thanks,
Kyrill

2014-10-31  Kyrylo Tkachov  <kyrylo.tkac...@arm.com>

    * config/aarch64/aarch64.h (MACHMODE): Remove 'enum' keyword.
    (CUMULATIVE_ARGS): Guard on !defined(USED_FOR_TARGET).
diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
index 97b1848..c37d4b1 100644
--- a/gcc/config/aarch64/aarch64.h
+++ b/gcc/config/aarch64/aarch64.h
@@ -611,10 +611,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
 {
@@ -635,6 +635,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)

Reply via email to