@@ -168,8 +168,10 @@ typedef struct {
} VexpressMachineState;
#define TYPE_VEXPRESS_MACHINE "vexpress"
-#define TYPE_VEXPRESS_A9_MACHINE MACHINE_TYPE_NAME("vexpress-a9")
-#define TYPE_VEXPRESS_A15_MACHINE MACHINE_TYPE_NAME("vexpress-a15")
+#define VEXPRESS_A9_MACHINE_NAME "vexpress-a9"
+#define VEXPRESS_A15_MACHINE_NAME "vexpress-a15"
+#define TYPE_VEXPRESS_A9_MACHINE
MACHINE_TYPE_NAME(VEXPRESS_A9_MACHINE_NAME)
+#define TYPE_VEXPRESS_A15_MACHINE
MACHINE_TYPE_NAME(VEXPRESS_A15_MACHINE_NAME)
#define VEXPRESS_MACHINE(obj) \