Makefile.in (attribs.o): Update.

	* Makefile.in (attribs.o): Update.
	* attribs.c: Include langhooks.h.
	(decl_attributes): Use langhook.
	* c-decl.c (insert_default_attributes): Rename.
	* c-tree.h (c_insert_default_attributes): New.
	* langhooks-def.h (LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES):New.
	(LANG_HOOKS_INITIALIZER): Update.
	* langhooks.h (struct lang_hooks): New hook.
	* tree.h (insert_default_attributes): Remove.
ada:
	* misc.c (insert_default_attributes): Remove.
cp:
	* cp-lang.c (LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES): Redefine.
	* cp-tree.h (cxx_insert_default_attributes): New.
	* decl.c (insert_default_attributes): Rename.
objc:
	* objc-lang.c (LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES): Redefine.

From-SVN: r51488

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6689e62c4dc9e460dae904d41198bdd4cac20b0e..540dc8283427b99f42a7622d537473ffdcade41a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2002-03-27  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+       * Makefile.in (attribs.o): Update.
+       * attribs.c: Include langhooks.h.
+       (decl_attributes): Use langhook.
+       * c-decl.c (insert_default_attributes): Rename.
+       * c-tree.h (c_insert_default_attributes): New.
+       * langhooks-def.h (LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES):New.
+       (LANG_HOOKS_INITIALIZER): Update.
+       * langhooks.h (struct lang_hooks): New hook.
+       * tree.h (insert_default_attributes): Remove.
+objc:
+       * objc-lang.c (LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES): Redefine.
+
 2002-03-27  Andreas Schwab  <schwab@suse.de>
 
        * config/i386/i386.c (classify_argument): Also check for

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 0603e261b04985e5d6b203bb6a214e4bf5a12dbf..2a71b731bf14710bb378cd3c95f45ff5d2920869 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1214,7 +1214,7 @@ c-common.o : c-common.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(OBSTACK_H) \
 
 attribs.o : attribs.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(OBSTACK_H) flags.h \
        toplev.h output.h c-pragma.h $(RTL_H) $(GGC_H) $(EXPR_H) $(TM_P_H) \
-       builtin-types.def $(TARGET_H)
+       builtin-types.def $(TARGET_H) langhooks.h
 
 c-format.o : c-format.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) \
        $(C_COMMON_H) flags.h toplev.h intl.h diagnostic.h

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 03f747711e92e58572b4465448be6eec7f8f8a95..3738cd4e183f620ea127d2ad0ae8a49863aebd1a 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-27  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+       * misc.c (insert_default_attributes): Remove.
+
 2002-03-27  Neil Booth  <neil@daikokuya.demon.co.uk>
 
        * misc.c (LANG_HOOKS_EXPAND_EXPR): Redefine.

diff --git a/gcc/ada/misc.c b/gcc/ada/misc.c
index 5a2c68ae4709e3d87c07b8c8f8ba82f7b08f1bb9..000e6046ce546f5f4327372f902f3d26fa7fdbc0 100644 (file)
--- a/gcc/ada/misc.c
+++ b/gcc/ada/misc.c
@@ -801,14 +801,6 @@ gnat_get_alias_set (type)
   return -1;
 }
 
-/* Set default attributes for functions.  We do nothing.  */
-
-void
-insert_default_attributes (decl)
-     tree decl ATTRIBUTE_UNUSED;
-{
-}
-
 /* GNU_TYPE is a type. Determine if it should be passed by reference by
    default.  */
 

diff --git a/gcc/attribs.c b/gcc/attribs.c
index 74f6b05d010f906bac0a5e0f613435bd0fdfe12d..69d2ef26a640ab81e82d6f274c824053bf9463e1 100644 (file)
--- a/gcc/attribs.c
+++ b/gcc/attribs.c
@@ -32,6 +32,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "obstack.h"
 #include "cpplib.h"
 #include "target.h"
+#include "langhooks.h"
 
 static void init_attributes            PARAMS ((void));
 
@@ -274,7 +275,7 @@ decl_attributes (node, attributes, flags)
 
   if (DECL_P (*node) && TREE_CODE (*node) == FUNCTION_DECL
       && !(flags & (int) ATTR_FLAG_BUILT_IN))
-    insert_default_attributes (*node);
+    (*lang_hooks.insert_default_attributes) (*node);
 
   for (a = attributes; a; a = TREE_CHAIN (a))
     {

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index e1d104d4fc9a7483e9b82d5fda0a05bc2b95c96a..620a16f5d5d251afa87c33f1c5f82d653ee74e7d 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -3087,7 +3087,7 @@ builtin_function (name, type, function_code, class, library_name)
    attributes.  */
 
 void
-insert_default_attributes (decl)
+c_insert_default_attributes (decl)
      tree decl;
 {
   if (!TREE_PUBLIC (decl))

diff --git a/gcc/c-lang.c b/gcc/c-lang.c
index a41730cff7bbf207660a8f93e57d4ca6a19894fd..c49c948fc465b95dcb5da7b931b5ba98dffa64bc 100644 (file)
--- a/gcc/c-lang.c
+++ b/gcc/c-lang.c
@@ -56,6 +56,8 @@ static void c_post_options PARAMS ((void));
 #define LANG_HOOKS_EXPAND_EXPR c_expand_expr
 #undef LANG_HOOKS_PARSE_FILE
 #define LANG_HOOKS_PARSE_FILE c_common_parse_file
+#undef LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES
+#define LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES c_insert_default_attributes
 #undef LANG_HOOKS_STATICP
 #define LANG_HOOKS_STATICP c_staticp
 #undef LANG_HOOKS_PRINT_IDENTIFIER

diff --git a/gcc/c-tree.h b/gcc/c-tree.h
index ad2d88df228f28ea7415467fa30c6c296e3b0cf4..53d55d4309bc4c72f98766b0caf05127d1feb0d8 100644 (file)
--- a/gcc/c-tree.h
+++ b/gcc/c-tree.h
@@ -175,6 +175,7 @@ extern void insert_block                    PARAMS ((tree));
 extern void set_block                          PARAMS ((tree));
 extern tree pushdecl                           PARAMS ((tree));
 
+extern void c_insert_default_attributes                PARAMS ((tree));
 extern void c_init_decl_processing             PARAMS ((void));
 extern void c_dup_lang_specific_decl           PARAMS ((tree));
 extern void c_print_identifier                 PARAMS ((FILE *, tree, int));

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7bd5c22137cbbd3087a4ecc30f3ec9e5ac263dba..5a936bae11f34fa57e1be50b3b96b25cc0c4ea61 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-27  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+       * cp-lang.c (LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES): Redefine.
+       * cp-tree.h (cxx_insert_default_attributes): New.
+       * decl.c (insert_default_attributes): Rename.
+
 2002-03-27  Mark Mitchell  <mark@codesourcery.com>
 
        PR c++/4884

diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c
index fd6c29f02dcca4abb8b10142f5fb00ea99971af5..7516b4352ecfa59118f208c95150de9a757459d6 100644 (file)
--- a/gcc/cp/cp-lang.c
+++ b/gcc/cp/cp-lang.c
@@ -61,6 +61,8 @@ static bool ok_to_generate_alias_set_for_type PARAMS ((tree));
 #define LANG_HOOKS_UNSAVE_EXPR_NOW cxx_unsave_expr_now
 #undef LANG_HOOKS_MAYBE_BUILD_CLEANUP
 #define LANG_HOOKS_MAYBE_BUILD_CLEANUP cxx_maybe_build_cleanup
+#undef LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES
+#define LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES cxx_insert_default_attributes
 #undef LANG_HOOKS_MARK_TREE
 #define LANG_HOOKS_MARK_TREE cxx_mark_tree
 #undef LANG_HOOKS_PRINT_STATISTICS

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 99cde0f8f3e93bf84721d491dbb497c70c475fbe..bab908b9a818f73363e6d329fb81c210c2fbf08d 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3667,6 +3667,7 @@ extern void set_block                             PARAMS ((tree));
 extern tree pushdecl                           PARAMS ((tree));
 extern void cxx_init_decl_processing           PARAMS ((void));
 extern void cxx_mark_tree                      PARAMS ((tree));
+extern void cxx_insert_default_attributes      PARAMS ((tree));
 extern int toplevel_bindings_p                 PARAMS ((void));
 extern int namespace_bindings_p                        PARAMS ((void));
 extern void keep_next_level                    PARAMS ((int));

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 208370793f405388bd8d36ac7a35f56b98e3cd60..7dbb55bdfbd4938d42f9b884c6cdff07db47473b 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6886,7 +6886,7 @@ push_throw_library_fn (name, type)
    attributes.  */
 
 void
-insert_default_attributes (decl)
+cxx_insert_default_attributes (decl)
      tree decl;
 {
   if (!DECL_EXTERN_C_FUNCTION_P (decl))

diff --git a/gcc/langhooks-def.h b/gcc/langhooks-def.h
index 974f86253607283a1d37f6c479e826aa5f7bc29c..61559a17d3b817b3e14e33ff32e26740ebc00ae2 100644 (file)
--- a/gcc/langhooks-def.h
+++ b/gcc/langhooks-def.h
@@ -82,6 +82,7 @@ tree lhd_tree_inlining_convert_parm_for_inlining PARAMS ((tree, tree, tree));
 #define LANG_HOOKS_EXPAND_EXPR         lhd_expand_expr
 #define LANG_HOOKS_SAFE_FROM_P         lhd_safe_from_p
 #define LANG_HOOKS_STATICP             lhd_staticp
+#define LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES lhd_do_nothing_t
 #define LANG_HOOKS_DUP_LANG_SPECIFIC_DECL lhd_do_nothing_t
 #define LANG_HOOKS_UNSAVE_EXPR_NOW     lhd_unsave_expr_now
 #define LANG_HOOKS_MAYBE_BUILD_CLEANUP lhd_return_null_tree
@@ -177,6 +178,7 @@ int lhd_tree_dump_type_quals                        PARAMS ((tree));
   LANG_HOOKS_GET_ALIAS_SET, \
   LANG_HOOKS_EXPAND_CONSTANT, \
   LANG_HOOKS_EXPAND_EXPR, \
+  LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES, \
   LANG_HOOKS_SAFE_FROM_P, \
   LANG_HOOKS_STATICP, \
   LANG_HOOKS_DUP_LANG_SPECIFIC_DECL, \

diff --git a/gcc/langhooks.h b/gcc/langhooks.h
index 332ede8d32fa5d373ea9f67874de9f984305e03a..a71f7ec37f64cc85c5d712a500aae45792ac0ea1 100644 (file)
--- a/gcc/langhooks.h
+++ b/gcc/langhooks.h
@@ -165,6 +165,10 @@ struct lang_hooks
      Fourth argument is actually an enum expand_modifier.  */
   rtx (*expand_expr) PARAMS ((tree, rtx, enum machine_mode, int));
 
+  /* Possibly apply default attributes to a function (represented by
+     a FUNCTION_DECL).  */
+  void (*insert_default_attributes) PARAMS ((tree));
+
   /* Hook called by safe_from_p for language-specific tree codes.  It is
      up to the language front-end to install a hook if it has any such
      codes that safe_from_p needs to know about.  Since same_from_p will

diff --git a/gcc/objc/objc-lang.c b/gcc/objc/objc-lang.c
index 702bbad632a550e302f98f8ae7a113f6620302f7..b189d6bfe93a349f221b073dd33afad84e82ab8e 100644 (file)
--- a/gcc/objc/objc-lang.c
+++ b/gcc/objc/objc-lang.c
@@ -50,6 +50,8 @@ static void objc_post_options                   PARAMS ((void));
 #define LANG_HOOKS_MARK_TREE c_mark_tree
 #undef LANG_HOOKS_EXPAND_EXPR
 #define LANG_HOOKS_EXPAND_EXPR c_expand_expr
+#undef LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES
+#define LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES c_insert_default_attributes
 #undef LANG_HOOKS_STATICP
 #define LANG_HOOKS_STATICP c_staticp
 #undef LANG_HOOKS_DUP_LANG_SPECIFIC_DECL

diff --git a/gcc/tree.h b/gcc/tree.h
index 3018f2a44907fc945a42212075bbab58b15c7a1d..6635248f928f7c714482818d9c0d03dfb0c3f70e 100644 (file)
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -2976,10 +2976,6 @@ extern tree decl_attributes              PARAMS ((tree *, tree, int));
 /* The following function must be provided by front ends
    using attribs.c.  */
 
-/* Possibly apply default attributes to a function (represented by
-   a FUNCTION_DECL).  */
-extern void insert_default_attributes PARAMS ((tree));
-
 /* Table of machine-independent attributes for checking formats, if used.  */
 extern const struct attribute_spec *format_attribute_table;