Fix build fallout with machine_mode changes.

2014-10-29  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>

        * config/arm/arm.h (MACHMODE): Treat machine_mode as a
        scalar typedef.
        (CUMULATIVE_ARGS): Guard against target includes.
        (machine_function): Likewise.

From-SVN: r216855

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 80935753a35a9c11b6545ba9b991e9329be7088a..ffa2ba07092e872d879cbe6eb53dd6c32aa1aace 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-29  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
+
+       * config/arm/arm.h (MACHMODE): Treat machine_mode as a
+       scalar typedef.
+       (CUMULATIVE_ARGS): Guard against target includes.
+       (machine_function): Likewise.
+
 2014-10-29  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        * config/aarch64/aarch64.c (aarch64_madd_needs_nop): Restore

diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index fef7e417502c986a048985a4db7392305cb9dcb0..cea71b676483512e0fc3a27ebcf4db3b2765761f 100644 (file)
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -36,7 +36,7 @@
 #define MACHMODE int
 #else
 #include "insn-modes.h"
-#define MACHMODE enum machine_mode
+#define MACHMODE machine_mode
 #endif
 
 #include "config/vxworks-dummy.h"
@@ -1510,7 +1510,7 @@ typedef struct GTY(()) arm_stack_offsets
 }
 arm_stack_offsets;
 
-#if !defined(GENERATOR_FILE) && !defined(USED_FOR_TARGET)
+#if !defined(GENERATOR_FILE) && !defined (USED_FOR_TARGET)
 /* A C structure for machine-specific, per-function data.
    This is added to the cfun structure.  */
 typedef struct GTY(()) machine_function
@@ -1578,6 +1578,7 @@ enum arm_pcs
 /* Default procedure calling standard of current compilation unit. */
 extern enum arm_pcs arm_pcs_default;
 
+#if !defined (USED_FOR_TARGET)
 /* A C type for declaring a variable that is used as the first argument of
    `FUNCTION_ARG' and other related values.  */
 typedef struct
@@ -1611,6 +1612,7 @@ typedef struct
   int aapcs_vfp_rcount;
   MACHMODE aapcs_vfp_rmode;
 } CUMULATIVE_ARGS;
+#endif
 
 #define FUNCTION_ARG_PADDING(MODE, TYPE) \
   (arm_pad_arg_upward (MODE, TYPE) ? upward : downward)