diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 71c594b65ce5..9b1204d8a6c1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-07  Ziemowit Laski  <zlaski@apple.com>
+
+	* c-tree.h (struct lang_type): Rename 'objc_protocols' field
+	to 'objc_info'.
+
 2004-12-07  Eric Christopher  <echristo@redhat.com>
 
 	PR target/16317
diff --git a/gcc/c-tree.h b/gcc/c-tree.h
index 21640ea6c887..5415ee079b60 100644
--- a/gcc/c-tree.h
+++ b/gcc/c-tree.h
@@ -73,9 +73,10 @@ struct lang_type GTY(())
   /* In an ENUMERAL_TYPE, the min and max values.  */
   tree enum_min;
   tree enum_max;
-  /* In a RECORD_TYPE, a list of Objective-C protocols that this type
-     adopts.  This is used only in Objective-C.  */
-  tree objc_protocols;
+  /* In a RECORD_TYPE, information specific to Objective-C, such
+     as a list of adopted protocols or a pointer to a corresponding
+     @interface.  See objc/objc-act.h for details.  */
+  tree objc_info;
 };
 
 /* Record whether a type or decl was written with nonconstant size.
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 16c854cc1a5b..f129e110c0f8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-07  Ziemowit Laski  <zlaski@apple.com>
+
+	* cp-tree.h (struct lang_type_class): Rename 'objc_protocols'
+	field to 'objc_info'.
+
 2004-12-07  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* pt.c: Replace a use of first_rtl_op with TREE_CODE_LENGTH.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index d2b4edcd4eca..318b3b30a257 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -1062,9 +1062,10 @@ struct lang_type_class GTY(())
   tree decl_list;
   tree template_info;
   tree befriending_classes;
-  /* In a RECORD_TYPE, a list of Objective-C protocols that this type
-     adopts.  This is used only in Objective-C++.  */
-  tree objc_protocols;
+  /* In a RECORD_TYPE, information specific to Objective-C++, such
+     as a list of adopted protocols or a pointer to a corresponding
+     @interface.  See objc/objc-act.h for details.  */
+  tree objc_info;
 };
 
 struct lang_type_ptrmem GTY(())