shouldn't be here anymore

[libfirm] / ir / be / ia32 / ia32_architecture.c

diff --git a/ir/be/ia32/ia32_architecture.c b/ir/be/ia32/ia32_architecture.c
index 5ad26c4..9893e50 100644 (file)
--- a/ir/be/ia32/ia32_architecture.c
+++ b/ir/be/ia32/ia32_architecture.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -27,8 +27,8 @@
 #include "config.h"
 #endif
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #include "irtools.h"
 
@@ -119,12 +119,12 @@ static int         opt_unsafe_floatconv = 0;
 
 /* instruction set architectures. */
 static const lc_opt_enum_int_items_t arch_items[] = {
-       { "386",        arch_i386, },
-       { "486",        arch_i486, },
+       { "i386",       arch_i386, },
+       { "i486",       arch_i486, },
        { "pentium",    arch_pentium, },
-       { "586",        arch_pentium, },
+       { "i586",       arch_pentium, },
        { "pentiumpro", arch_pentium_pro, },
-       { "686",        arch_pentium_pro, },
+       { "i686",       arch_pentium_pro, },
        { "pentiummmx", arch_pentium_mmx, },
        { "pentium2",   arch_pentium_2, },
        { "p2",         arch_pentium_2, },
@@ -180,7 +180,7 @@ static const lc_opt_table_entry_t ia32_architecture_options[] = {
                            &fp_unit_var),
        LC_OPT_ENT_NEGBIT("nooptcc",       "do not optimize calling convention",
                          &opt_cc, 1),
-       LC_OPT_ENT_BIT("unsafe_floatconv", "do unsage floating point controlword "
+       LC_OPT_ENT_BIT("unsafe_floatconv", "do unsafe floating point controlword "
                       "optimisations", &opt_unsafe_floatconv, 1),
        LC_OPT_LAST
 };
@@ -407,10 +407,12 @@ void ia32_setup_cg_config(void)
 
 void ia32_init_architecture(void)
 {
+       lc_opt_entry_t *be_grp, *ia32_grp;
+
        memset(&ia32_cg_config, 0, sizeof(ia32_cg_config));
 
-       lc_opt_entry_t *be_grp   = lc_opt_get_grp(firm_opt_get_root(), "be");
-       lc_opt_entry_t *ia32_grp = lc_opt_get_grp(be_grp, "ia32");
+       be_grp   = lc_opt_get_grp(firm_opt_get_root(), "be");
+       ia32_grp = lc_opt_get_grp(be_grp, "ia32");
 
        lc_opt_add_table(ia32_grp, ia32_architecture_options);
 }