+2012-07-25 Richard Henderson <rth@redhat.com>
+
+ PR bootstrap/54092
+ * libfuncs.h: Don't include optabs.h.
+ (struct libfunc_entry): Use "int" for op, mode1, mode2 members.
+ * optabs.c (hash_libfunc): Don't cast members to int.
+ * Makefile.in (LIBFUNCS_H): Don't include OPTABS_H.
+
2012-07-25 Dodji Seketeli <dodji@redhat.com>
* basic-block.c: Fix typo in comment.
$(CONFIG_H) $(SYSTEM_H) $(HASHTAB_H)
PLUGIN_H = plugin.h $(GCC_PLUGIN_H)
PLUGIN_VERSION_H = plugin-version.h configargs.h
-LIBFUNCS_H = libfuncs.h $(HASHTAB_H) $(OPTABS_H)
+LIBFUNCS_H = libfuncs.h $(HASHTAB_H)
#\f
# Now figure out from those variables how to compile and link.
/* Definitions for code generation pass of GNU compiler.
- Copyright (C) 2001, 2004, 2007, 2008, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2001-2012 Free Software Foundation, Inc.
This file is part of GCC.
#define GCC_LIBFUNCS_H
#include "hashtab.h"
-#include "optabs.h"
/* Enumeration of indexes into libfunc_table. */
enum libfunc_index
LTI_MAX
};
-/* Information about an optab-related libfunc. We use the same hashtable
- for normal optabs and conversion optabs. In the first case mode2
- is unused. */
+/* Information about an optab-related libfunc. The op field is logically
+ an enum optab_d, and the mode fields are logically enum machine_mode.
+ However, in the absence of forward-declared enums, there's no practical
+ benefit of pulling in the defining headers.
+
+ We use the same hashtable for normal optabs and conversion optabs. In
+ the first case mode2 is forced to VOIDmode. */
+
struct GTY(()) libfunc_entry {
- optab op;
- enum machine_mode mode1, mode2;
+ int op, mode1, mode2;
rtx libfunc;
};
hash_libfunc (const void *p)
{
const struct libfunc_entry *const e = (const struct libfunc_entry *) p;
- return (((int) e->mode1 + (int) e->mode2 * NUM_MACHINE_MODES) ^ e->op);
+ return ((e->mode1 + e->mode2 * NUM_MACHINE_MODES) ^ e->op);
}
/* Used for libfunc_hash. */