* genattr.c (main): Don't define

	TRADITIONAL_PIPELINE_INTERFACE or DFA_PIPELINE_INTERFACE.
	* system.h (TRADITIONAL_PIPELINE_INTERFACE): Poison.
	(DFA_PIPELINE_INTERFACE): Likewise.
	* doc/tm.texi (TRADITIONAL_PIPELINE_INTERFACE): Remove.
	(DFA_PIPELINE_INTERFACE): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78628 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9f72e28..f255b8a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-28  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * genattr.c (main): Don't define
+       TRADITIONAL_PIPELINE_INTERFACE or DFA_PIPELINE_INTERFACE.
+       * system.h (TRADITIONAL_PIPELINE_INTERFACE): Poison.
+       (DFA_PIPELINE_INTERFACE): Likewise.
+       * doc/tm.texi (TRADITIONAL_PIPELINE_INTERFACE): Remove.
+       (DFA_PIPELINE_INTERFACE): Likewise.
+
 2004-02-28  Richard Sandiford  <rsandifo@redhat.com>
 
        * config/mips/mips.md (tstsi, tstdi): Delete.

diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 2018ca2..c25da06 100644 (file)
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -5708,24 +5708,6 @@ not in cases of "costly dependences", which this hooks allows to define.
 Macros in the following table are generated by the program
 @file{genattr} and can be useful for writing the hooks.
 
-@defmac TRADITIONAL_PIPELINE_INTERFACE
-The macro definition is generated if there is a traditional pipeline
-description in @file{.md} file. You should also remember that to
-simplify the insn scheduler sources an empty traditional pipeline
-description interface is generated even if there is no a traditional
-pipeline description in the @file{.md} file.  The macro can be used to
-distinguish the two types of the traditional interface.
-@end defmac
-
-@defmac DFA_PIPELINE_INTERFACE
-The macro definition is generated if there is an automaton pipeline
-description in @file{.md} file.  You should also remember that to
-simplify the insn scheduler sources an empty automaton pipeline
-description interface is generated even if there is no an automaton
-pipeline description in the @file{.md} file.  The macro can be used to
-distinguish the two types of the automaton interface.
-@end defmac
-
 @defmac MAX_DFA_ISSUE_RATE
 The macro definition is generated in the automaton based pipeline
 description interface.  Its value is calculated from the automaton

diff --git a/gcc/genattr.c b/gcc/genattr.c
index 49f368e..5ec5c81 100644 (file)
--- a/gcc/genattr.c
+++ b/gcc/genattr.c
@@ -300,12 +300,6 @@ main (int argc, char **argv)
 
   if (num_units > 0 || num_insn_reservations > 0)
     {
-      if (num_units > 0)
-       printf ("#define TRADITIONAL_PIPELINE_INTERFACE 1\n");
-
-      if (num_insn_reservations > 0)
-       printf ("#define DFA_PIPELINE_INTERFACE 1\n");
-
       /* Compute the range of blockage cost values.  See genattrtab.c
         for the derivation.  BLOCKAGE (E,C) when SIMULTANEITY is zero is
 

diff --git a/gcc/system.h b/gcc/system.h
index 5e8a2cd..6efa82b 100644 (file)
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -638,7 +638,8 @@ typedef char _Bool;
        LINKER_DOES_NOT_WORK_WITH_DWARF2 FUNCTION_ARG_KEEP_AS_REFERENCE    \
        GIV_SORT_CRITERION MAX_LONG_TYPE_SIZE MAX_LONG_DOUBLE_TYPE_SIZE    \
        MAX_WCHAR_TYPE_SIZE GCOV_TYPE_SIZE SHARED_SECTION_ASM_OP           \
-       FINAL_REG_PARM_STACK_SPACE MAYBE_REG_PARM_STACK_SPACE
+       FINAL_REG_PARM_STACK_SPACE MAYBE_REG_PARM_STACK_SPACE              \
+       TRADITIONAL_PIPELINE_INTERFACE DFA_PIPELINE_INTERFACE
 
 /* Hooks that are no longer used.  */
  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE  \