merge from gcc

2010-11-17 02:03:39 +00:00
parent 2988dfa72b
commit 7ee4d16356
2 changed files with 12 additions and 6 deletions
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-16  Ian Lance Taylor  <iant@google.com>
+
+	* simple-object.h (simple_object_attributes_merge): Declare,
+	replacing simple_object_attributes_compare.
+
 2010-11-16  Jie Zhang  <jie.zhang@analog.com>

 	* elf/bfin.h (EF_BFIN_CODE_IN_L1): Define.