* desc-cpu.scm (gen-ifld-decls): Move cgen_ifld_table from here..

	(cgen-desc.h): ..to here, after opcode/cgen.h include.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index 1d5b722..d91ffcf 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-22  Alan Modra  <amodra@bigpond.net.au>
+
+       * desc-cpu.scm (gen-ifld-decls): Move cgen_ifld_table from here..
+       (cgen-desc.h): ..to here, after opcode/cgen.h include.
+
 2005-02-16  Dave Brolley  <brolley@redhat.com>
 
        * utils.scm: Update copyright years.

diff --git a/cgen/desc-cpu.scm b/cgen/desc-cpu.scm
index aa482f7..438a662 100644 (file)
--- a/cgen/desc-cpu.scm
+++ b/cgen/desc-cpu.scm
@@ -112,7 +112,6 @@ static const CGEN_MACH @arch@_cgen_mach_table[] = {
   (logit 2 "Generating instruction field decls ...\n")
   (string-list
    "/* Ifield support.  */\n\n"
-   "extern const struct cgen_ifld @arch@_cgen_ifld_table[];\n\n"
    "/* Ifield attribute indices.  */\n\n"
    (gen-attr-enum-decl "cgen_ifld" (current-ifld-attr-list))
    (gen-enum-decl 'ifield_type "@arch@ ifield types"
@@ -1014,6 +1013,7 @@ init_tables ()
    gen-insn-decls
    "/* cgen.h uses things we just defined.  */\n"
    "#include \"opcode/cgen.h\"\n\n"
+   "extern const struct cgen_ifld @arch@_cgen_ifld_table[];\n\n"
    -gen-attr-table-decls
    -gen-mach-table-decls
    gen-hw-table-decls