system.h (GIV_SORT_CRITERION): Poison.

	* system.h (GIV_SORT_CRITERION): Poison.
	* config/avr/avr.h (GIV_SORT_CRITERION): Remove.
	* config/ip2k/ip2k.h (GIV_SORT_CRITERION): Likewise.

From-SVN: r77194

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2ee6a1435877bccf1dab2e84a7f7e600ae95f6b3..3bfb9960a72bbdcca3eeee2c10fbf1d9c54fc953 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-03  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * system.h (GIV_SORT_CRITERION): Poison.
+       * config/avr/avr.h (GIV_SORT_CRITERION): Remove.
+       * config/ip2k/ip2k.h (GIV_SORT_CRITERION): Likewise.
+
 2004-02-03  Roger Sayle  <roger@eyesopen.com>
 
        PR target/9348

diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index df1c96777385cee27b89d350071b19948c8e0cfb..64884281928fe9b1859870fbafcfe652c6a6b6a2 100644 (file)
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -772,20 +772,6 @@ extern int avr_case_values_threshold;
 
 #define NO_DOLLAR_IN_LABEL 1
 
-#define GIV_SORT_CRITERION(X, Y)       \
-  if (GET_CODE ((X)->add_val) == CONST_INT             \
-      && GET_CODE ((Y)->add_val) == CONST_INT)         \
-    return INTVAL ((X)->add_val) - INTVAL ((Y)->add_val);
-
-/* `GIV_SORT_CRITERION(GIV1, GIV2)'
-   In some cases, the strength reduction optimization pass can
-   produce better code if this is defined.  This macro controls the
-   order that induction variables are combined.  This macro is
-   particularly useful if the target has limited addressing modes.
-   For instance, the SH target has only positive offsets in
-   addresses.  Thus sorting to put the smallest address first allows
-   the most combinations to be found.  */
-
 #define TRAMPOLINE_TEMPLATE(FILE) \
   internal_error ("trampolines not supported")
 

diff --git a/gcc/config/ip2k/ip2k.h b/gcc/config/ip2k/ip2k.h
index 70eecdec2aaaeccac35c5c2224f3cc668768edc2..0769572fc533e1820a7ec3c4bf402337a0fff324 100644 (file)
--- a/gcc/config/ip2k/ip2k.h
+++ b/gcc/config/ip2k/ip2k.h
@@ -795,21 +795,6 @@ extern int ip2k_reorg_split_himode;
 extern int ip2k_reorg_merge_qimode;
 /* Flag to indicate that it's safe to merge QImode operands.  */
 
-#define GIV_SORT_CRITERION(X, Y)                       \
-  do {                                                 \
-    if (GET_CODE ((X)->add_val) == CONST_INT           \
-        && GET_CODE ((Y)->add_val) == CONST_INT)       \
-      return INTVAL ((X)->add_val) - INTVAL ((Y)->add_val); \
-  } while (0)
-
-/* In some cases, the strength reduction optimization pass can
-   produce better code if this is defined.  This macro controls the
-   order that induction variables are combined.  This macro is
-   particularly useful if the target has limited addressing modes.
-   For instance, the SH target has only positive offsets in
-   addresses.  Thus sorting to put the smallest address first allows
-   the most combinations to be found.  */
-
 #define TRAMPOLINE_TEMPLATE(FILE) abort ()
 
 #define TRAMPOLINE_SIZE 4

diff --git a/gcc/system.h b/gcc/system.h
index 6c4c52264ece893690b3ec271656645f8ce9e96c..f77f0bf322335672fd8d880e17133db59b53b77b 100644 (file)
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -632,7 +632,8 @@ typedef char _Bool;
        CONVERT_HARD_REGISTER_TO_SSA_P ASM_OUTPUT_MAIN_SOURCE_FILENAME     \
        FIRST_INSN_ADDRESS TEXT_SECTION SHARED_BSS_SECTION_ASM_OP          \
        PROMOTED_MODE EXPAND_BUILTIN_VA_END                                \
-       LINKER_DOES_NOT_WORK_WITH_DWARF2 FUNCTION_ARG_KEEP_AS_REFERENCE
+       LINKER_DOES_NOT_WORK_WITH_DWARF2 FUNCTION_ARG_KEEP_AS_REFERENCE    \
+       GIV_SORT_CRITERION
 
 /* Hooks that are no longer used.  */
  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE  \