system.h (PROMOTE_FUNCTION_ARGS, [...]): Poison.

	* system.h (PROMOTE_FUNCTION_ARGS, STRUCT_VALUE_INCOMING, and
	STRICT_ARGUMENT_NAMING): Poison.
	* target-def.h (TARGET_PROMOTE_FUNCTION_ARGS): Define as
	hook_bool_tree_false.
	* targhooks.c (default_promote_function_args): Remove.
	(default_struct_value_rtx): Don't use STRUCT_VALUE_INCOMING.
	Don't check incoming.
	(default_strict_argument_naming): Don't use
	STRICT_ARGUMENT_NAMING.
	* targhooks.h: Remove the prototype for
	default_promote_function_args.

From-SVN: r77047

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 67b2e832880e44a59001a2b9a3f32d1a0e055669..a08af876499b9ac5d7e9e94fac86f516d2e13d07 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2004-01-31  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * system.h (PROMOTE_FUNCTION_ARGS, STRUCT_VALUE_INCOMING, and
+       STRICT_ARGUMENT_NAMING): Poison.
+       * target-def.h (TARGET_PROMOTE_FUNCTION_ARGS): Define as
+       hook_bool_tree_false.
+       * targhooks.c (default_promote_function_args): Remove.
+       (default_struct_value_rtx): Don't use STRUCT_VALUE_INCOMING.
+       Don't check incoming.
+       (default_strict_argument_naming): Don't use
+       STRICT_ARGUMENT_NAMING.
+       * targhooks.h: Remove the prototype for
+       default_promote_function_args.
+
 2004-01-31  Kazu Hirata  <kazu@cs.umass.edu>
 
        * config/i386/i386-protos.h: Remove the prototype for

diff --git a/gcc/system.h b/gcc/system.h
index defeed06601c33820a4676a33f4d9d8b95dd19e0..52a9eb7d42ea1026cde74b83c065c83222efba4c 100644 (file)
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -602,7 +602,8 @@ typedef char _Bool;
        DIVDI3_LIBCALL UDIVSI3_LIBCALL UDIVDI3_LIBCALL MODSI3_LIBCALL   \
        MODDI3_LIBCALL UMODSI3_LIBCALL UMODDI3_LIBCALL BUILD_VA_LIST_TYPE \
        PRETEND_OUTGOING_VARARGS_NAMED STRUCT_VALUE_INCOMING_REGNUM     \
-       ASM_OUTPUT_SECTION_NAME
+       ASM_OUTPUT_SECTION_NAME PROMOTE_FUNCTION_ARGS                   \
+       STRUCT_VALUE_INCOMING STRICT_ARGUMENT_NAMING
 
 /* Other obsolete target macros, or macros that used to be in target
    headers and were not used, and may be obsolete or may never have

diff --git a/gcc/target-def.h b/gcc/target-def.h
index 321cd08a2c149fdc86c65fddc1aa945687291abc..02c00d081cfe0650e9d0f5a994af5b05d2125a3c 100644 (file)
--- a/gcc/target-def.h
+++ b/gcc/target-def.h
@@ -325,7 +325,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define TARGET_GET_PCH_VALIDITY default_get_pch_validity
 #define TARGET_PCH_VALID_P default_pch_valid_p
 
-#define TARGET_PROMOTE_FUNCTION_ARGS default_promote_function_args
+#define TARGET_PROMOTE_FUNCTION_ARGS hook_bool_tree_false
 #define TARGET_PROMOTE_FUNCTION_RETURN default_promote_function_return
 #define TARGET_PROMOTE_PROTOTYPES default_promote_prototypes
 

diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 308ada6057c0d3d327e4a12da8ad7bda30dc29b3..fe2647e476ced4f3874137c11a256f1a9b4c1915 100644 (file)
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -78,16 +78,6 @@ default_cc_modes_compatible (enum machine_mode m1, enum machine_mode m2)
   return VOIDmode;
 }
 
-bool
-default_promote_function_args (tree fntype ATTRIBUTE_UNUSED)
-{
-#ifdef PROMOTE_FUNCTION_ARGS
-  return true;
-#else
-  return false;
-#endif
-}
-
 bool
 default_promote_function_return (tree fntype ATTRIBUTE_UNUSED)
 {
@@ -108,38 +98,18 @@ default_promote_prototypes (tree fntype ATTRIBUTE_UNUSED)
 }
 
 rtx
-default_struct_value_rtx (tree fntype ATTRIBUTE_UNUSED, int incoming)
+default_struct_value_rtx (tree fntype ATTRIBUTE_UNUSED,
+                         int incoming ATTRIBUTE_UNUSED)
 {
-  rtx rv = 0;
-  if (incoming)
-    {
-#ifdef STRUCT_VALUE_INCOMING
-      rv = STRUCT_VALUE_INCOMING;
-#else
 #ifdef STRUCT_VALUE
-      rv = STRUCT_VALUE;
+  return STRUCT_VALUE;
 #else
-#ifndef STRUCT_VALUE_REGNUM
-      abort();
+#ifdef STRUCT_VALUE_REGNUM
+  return gen_rtx_REG (Pmode, STRUCT_VALUE_REGNUM);
 #else
-      rv = gen_rtx_REG (Pmode, STRUCT_VALUE_REGNUM);
-#endif
+  abort ();
 #endif
 #endif
-    }
-  else
-    {
-#ifdef STRUCT_VALUE
-      rv = STRUCT_VALUE;
-#else
-#ifndef STRUCT_VALUE_REGNUM
-      abort();
-#else
-      rv = gen_rtx_REG (Pmode, STRUCT_VALUE_REGNUM);
-#endif
-#endif
-    }
-  return rv;
 }
 
 bool
@@ -179,11 +149,7 @@ default_setup_incoming_varargs (CUMULATIVE_ARGS *ca ATTRIBUTE_UNUSED,
 bool
 default_strict_argument_naming (CUMULATIVE_ARGS *ca ATTRIBUTE_UNUSED)
 {
-#ifdef STRICT_ARGUMENT_NAMING
-  return STRICT_ARGUMENT_NAMING;
-#else
-  return 0;
-#endif
+  return false;
 }
 
 bool

diff --git a/gcc/targhooks.h b/gcc/targhooks.h
index 63525fe04b70b9a4a44889c2dffdfb5e72087802..d91dda395bf396a0c4736ba1f97f40cbf73ffb52 100644 (file)
--- a/gcc/targhooks.h
+++ b/gcc/targhooks.h
@@ -23,7 +23,6 @@ extern void default_external_libcall (rtx);
 extern enum machine_mode default_cc_modes_compatible (enum machine_mode,
                                                      enum machine_mode);
 
-extern bool default_promote_function_args (tree);
 extern bool default_promote_function_return (tree);
 extern bool default_promote_prototypes (tree);