From f74e99104f03e84f8fdd87c4702dce41a0dd918e Mon Sep 17 00:00:00 2001
From: Kyrylo Tkachov <kyrylo.tkachov@arm.com>
Date: Wed, 29 Oct 2014 17:02:59 +0000
Subject: [PATCH] [ARM] Fix/revert fallout from machine_mode change.
* config/arm/arm.h (MACHMODE): Add 'enum' to machine_mode.
(struct machine_function): Gate definition on
!defined(USED_FOR_TARGET).
From-SVN: r216845
---
gcc/ChangeLog | 6 ++++++
gcc/config/arm/arm.h | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 138fecd1d887..c951769c62b8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-29 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
+
+ * config/arm/arm.h (MACHMODE): Add 'enum' to machine_mode.
+ (struct machine_function): Gate definition on
+ !defined(USED_FOR_TARGET).
+
2014-10-29 DJ Delorie <dj@redhat.com>
* expmed.c (strict_volatile_bitfield_p): Fix off-by-one error.
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 02d0a93f7493..fef7e417502c 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 machine_mode
+#define MACHMODE enum machine_mode
#endif
#include "config/vxworks-dummy.h"
@@ -1510,7 +1510,7 @@ typedef struct GTY(()) arm_stack_offsets
}
arm_stack_offsets;
-#ifndef GENERATOR_FILE
+#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
--
GitLab