X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Farm%2Farm_emitter.c;h=85fa69e408b5dfcfefcdcc8c6a88ac0b098e943f;hb=644c7ca46f7d4b85ba28c6e59f31068f3e323216;hp=6dc2cb13342282a8fc6adeb9dc4b8f3944e2ad5f;hpb=d4bbab11371a9c68aa2a716eaa7589b82a28691e;p=libfirm

diff --git a/ir/be/arm/arm_emitter.c b/ir/be/arm/arm_emitter.c
index 6dc2cb133..85fa69e40 100644
--- a/ir/be/arm/arm_emitter.c
+++ b/ir/be/arm/arm_emitter.c
@@ -25,9 +25,7 @@
  */
 #define SILENCER
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
@@ -68,7 +66,6 @@
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 static const arm_code_gen_t *cg;
-static const arm_isa_t      *isa;
 static set                  *sym_or_tv;
 
 /**
@@ -812,7 +809,7 @@ static void emit_be_Copy(const ir_node *irn) {
 	}
 
 	if (mode_is_float(mode)) {
-		if (USE_FPA(isa)) {
+		if (USE_FPA(cg->isa)) {
 			be_emit_cstring("\tmvf");
 			arm_emit_mode(irn);
 			be_emit_char(' ');
@@ -992,7 +989,7 @@ typedef void (emit_func)(const ir_node *irn);
 /**
  * Set a node emitter. Make it a bit more type safe.
  */
-static INLINE void set_emitter(ir_op *op, emit_func arm_emit_node) {
+static inline void set_emitter(ir_op *op, emit_func arm_emit_node) {
 	op->ops.generic = (op_func)arm_emit_node;
 }
 
@@ -1202,7 +1199,6 @@ void arm_gen_routine(const arm_code_gen_t *arm_cg, ir_graph *irg) {
 	ir_entity *entity     = get_irg_entity(irg);
 
 	cg        = arm_cg;
-	isa       = (const arm_isa_t *)cg->arch_env;
 	sym_or_tv = new_set(cmp_sym_or_tv, 8);
 
 	arm_register_emitters();