fixed isa template initializer

[r13661]

diff --git a/ir/be/arm/bearch_arm.c b/ir/be/arm/bearch_arm.c
index db6c9c4..f39dfa6 100644 (file)
--- a/ir/be/arm/bearch_arm.c
+++ b/ir/be/arm/bearch_arm.c
@@ -693,15 +693,17 @@ static void arm_handle_intrinsics(void) {
  *****************************************************************/
 
 static arm_isa_t arm_isa_template = {
-       &arm_isa_if,           /* isa interface */
-       &arm_gp_regs[REG_SP],  /* stack pointer */
-       &arm_gp_regs[REG_R11], /* base pointer */
-       -1,                    /* stack direction */
-       0,                     /* number of codegenerator objects */
+       {
+               &arm_isa_if,           /* isa interface */
+               &arm_gp_regs[REG_SP],  /* stack pointer */
+               &arm_gp_regs[REG_R11], /* base pointer */
+               -1,                    /* stack direction */
+               NULL,                  /* main environment */
+       },
        0,                     /* use generic register names instead of SP, LR, PC */
-       NULL,                  /* current code generator */
-       NULL,                  /* output file */
        ARM_FPU_ARCH_FPE,      /* FPU architecture */
+       NULL,                  /* current code generator */
+       { NULL, },             /* emitter environment */
 };
 
 /**

diff --git a/ir/be/arm/bearch_arm_t.h b/ir/be/arm/bearch_arm_t.h
index 86fa327..c6d241f 100644 (file)
--- a/ir/be/arm/bearch_arm_t.h
+++ b/ir/be/arm/bearch_arm_t.h
@@ -150,9 +150,9 @@ typedef struct _arm_code_gen_t {
 struct _arm_isa_t {
        arch_isa_t             arch_isa;      /**< must be derived from arch_isa_t */
        int                    gen_reg_names; /**< use generic register names instead of SP, LR, PC */
+       int                    fpu_arch;      /**< FPU architecture */
        arm_code_gen_t        *cg;            /**< current code generator */
        be_emit_env_t          emit;          /**< An emitter environment for the GAS emitter. */
-       int                    fpu_arch;      /**< FPU architecture */
 };