ChangeLog: Merge text from include/ChangeLog.

	* ChangeLog: Merge text from include/ChangeLog.
	* include/ChangeLog: Delete.

From-SVN: r82984

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index cc2b931688754f22a1334aa56cc41c5905ba6210..a48b872a87c4e8a158cd6c816f35737309240240 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -9,7 +9,7 @@
        (save_macros): Save macro as text not as internal structures.
        (cpp_prepare_state): Update for changes to save_macro_data.
        (cpp_read_state): Don't read macros defined in PCH.  Restore
-       -D macros as text.  
+       -D macros as text.
        * macro.c (create_iso_definition): Honour alloc_subobject.
        Clear traditional flag.
        (_cpp_create_definition): Honour alloc_subobject.
@@ -20,7 +20,15 @@
        (cpp_macro): Likewise.
        * directives.c (struct answer): Move to cpp-id-data.h.
        (do_assert): Honour alloc_subobject.
-       
+
+       * include/symtab.h (struct ht): Add field 'alloc_subobject'.
+       * include/cpplib.h (struct cpp_string): Add GTY marker.
+       (enum cpp_token_fld_kind): New.
+       (struct cpp_token): Add GTY markers.
+       (cpp_token_val_index): Prototype.
+       (CPP_HASHNODE_VALUE_IDX): New.
+       (struct cpp_hashnode): Don't skip fields of 'value' when marking.
+       * include/cpp-id-data.h: New file.
 
 2004-06-09  Paolo Bonzini  <bonzini@gnu.org>
 
@@ -76,6 +84,8 @@
        (ht_destroy): Honour entries_owned.
        (ht_expand): Likewise.
        (ht_load): New.
+       * include/symtab.h (struct ht): New field 'entries_owned'
+       (ht_load): New prototype.
 
 2004-05-26  Paolo Bonzini  <bonzini@gnu.org>
 
@@ -129,4 +139,8 @@
        * line-map.c: Moved from gcc.  Do not include intl.h.
        * mkdeps.c: Moved from gcc.
        * system.h: New file.
-
+       * include/cpplib.h: Moved from gcc.  Change header guard name.
+       * include/line-map.h: Moved from gcc.  Change header guard name.
+       * include/mkdeps.h: Moved from gcc.  Change header guard name.
+       * include/symtab.h: Moved from gcc/hashtable.h.  Change header
+       guard name.

diff --git a/libcpp/include/ChangeLog b/libcpp/include/ChangeLog
deleted file mode 100644 (file)
index 0dbd0c3..0000000
--- a/libcpp/include/ChangeLog
+++ /dev/null
@@ -1,23 +0,0 @@
-2004-06-09  Geoffrey Keating  <geoffk@apple.com>
-
-       * symtab.h (struct ht): Add field 'alloc_subobject'.
-       * cpplib.h (struct cpp_string): Add GTY marker.
-       (enum cpp_token_fld_kind): New.
-       (struct cpp_token): Add GTY markers.
-       (cpp_token_val_index): Prototype.
-       (CPP_HASHNODE_VALUE_IDX): New.
-       (struct cpp_hashnode): Don't skip fields of 'value' when marking.
-       * cpp-id-data.h: New file.
-
-2004-05-29  Geoffrey Keating  <geoffk@apple.com>
-
-       * symtab.h (struct ht): New field 'entries_owned'
-       (ht_load): New prototype.
-
-2004-05-23  Paolo Bonzini  <bonzini@gnu.org>
-
-       * cpplib.h: Moved from gcc.  Change header guard name.
-       * line-map.h: Moved from gcc.  Change header guard name.
-       * mkdeps.h: Moved from gcc.  Change header guard name.
-       * symtab.h: Moved from gcc/hashtable.h.  Change header
-       guard name.