diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog
index 9cf6c78867fee198bcc706ad6a9294be061bdf82..59e06b5a34ee9d9415e66c5f8213e911fedb1e2d 100644
--- a/gcc/treelang/ChangeLog
+++ b/gcc/treelang/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-09  Tim Josling  <tej@melbpc.org.au>
+
+	Support new attributes regime (Fix for PR c++/7099).
+	
+	* treetree.c (handle_format_attribute): Return NULL_TREE instead
+	of aborting.
+	(top level): Define LANG_HOOKS_COMMON_ATTRIBUTE_TABLE
+	LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE
+	LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES as the standard C routines.
+
 2002-06-21  Andreas Jaeger  <aj@suse.de>
 
 	* Make-lang.in (treelang/tree1.o, treelang/treetree.o,
diff --git a/gcc/treelang/treetree.c b/gcc/treelang/treetree.c
index 2d05ce1bbf4851885a1befcd96016c5926d4088f..5c829560048578f16169f0f65c03d8e97f962d4b 100644
--- a/gcc/treelang/treetree.c
+++ b/gcc/treelang/treetree.c
@@ -119,6 +119,12 @@ int warn_format_zero_length = 0;
 #define LANG_HOOKS_TYPE_FOR_SIZE c_common_type_for_size
 #undef LANG_HOOKS_PARSE_FILE
 #define LANG_HOOKS_PARSE_FILE treelang_parse_file
+#undef LANG_HOOKS_COMMON_ATTRIBUTE_TABLE
+#define LANG_HOOKS_COMMON_ATTRIBUTE_TABLE c_common_attribute_table
+#undef LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE
+#define LANG_HOOKS_FORMAT_ATTRIBUTE_TABLE c_common_format_attribute_table
+#undef LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES
+#define LANG_HOOKS_INSERT_DEFAULT_ATTRIBUTES c_insert_default_attributes
 
 /* Hook routines and data unique to treelang.  */
 
@@ -996,7 +1002,7 @@ cpp_errors (cpp_reader *pfile ATTRIBUTE_UNUSED)
   abort ();
 }
 
-/* Should not be called for treelang.   */
+/* Dummy called by C.   */
 
 tree
 handle_format_attribute (tree *node ATTRIBUTE_UNUSED,
@@ -1005,7 +1011,7 @@ handle_format_attribute (tree *node ATTRIBUTE_UNUSED,
                          int flags ATTRIBUTE_UNUSED,
                          bool *no_add_attrs ATTRIBUTE_UNUSED)
 {
-  abort ();
+  return NULL_TREE; 
 }
 
 /* Should not be called for treelang.   */