diff options
| author | Ramana Radhakrishnan <ramana.radhakrishnan@arm.com> | 2014-10-29 23:41:04 +0000 |
|---|---|---|
| committer | Ramana Radhakrishnan <ramana@gcc.gnu.org> | 2014-10-29 23:41:04 +0000 |
| commit | 2c0122c97b62abe64aa169296f30a43ab2d3d2e3 (patch) | |
| tree | a2b420198c1ed55266d5dc477d9eb4c7cade5f9d /gcc | |
| parent | 3fea1a75f5a7f9bba73e2b7dbf40aeee41a51983 (diff) | |
| download | gcc-2c0122c97b62abe64aa169296f30a43ab2d3d2e3.zip gcc-2c0122c97b62abe64aa169296f30a43ab2d3d2e3.tar.gz gcc-2c0122c97b62abe64aa169296f30a43ab2d3d2e3.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/arm/arm.h | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8093575..ffa2ba0 100644 --- 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 fef7e41..cea71b6 100644 --- 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) |