merge from gcc

diff --git a/include/plugin-api.h b/include/plugin-api.h
index 122424c6cb77cc30b37d08980f2efe785d2775ad..df0039372f37eca1626d47bc2fe751ac149b9be2 100644 (file)
--- a/include/plugin-api.h
+++ b/include/plugin-api.h
@@ -155,13 +155,7 @@ enum ld_plugin_symbol_resolution
   LDPR_RESOLVED_EXEC,
 
   /* This symbol was resolved by a definition in a shared object.  */
-  LDPR_RESOLVED_DYN,
-
-  /* This is the prevailing definition of the symbol, with no
-     references from regular objects.  It is only referenced from IR
-     code, but the symbol is exported and may be referenced from
-     a dynamic object (not seen at link time).  */
-  LDPR_PREVAILING_DEF_IRONLY_EXP
+  LDPR_RESOLVED_DYN
 };
 
 /* The plugin library's "claim file" handler.  */
@@ -353,8 +347,7 @@ enum ld_plugin_tag
   LDPT_GET_INPUT_SECTION_NAME,
   LDPT_GET_INPUT_SECTION_CONTENTS,
   LDPT_UPDATE_SECTION_ORDER,
-  LDPT_ALLOW_SECTION_ORDERING,
-  LDPT_GET_SYMBOLS_V2
+  LDPT_ALLOW_SECTION_ORDERING
 };
 
 /* The plugin transfer vector.  */

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 917a2f8086d1cc0683d3d4dd7c825c67d0a08ff5..0547f9b08ed401a953c877319a1560bf3507b128 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -9,6 +9,7 @@
        * testsuite/demangle-expected: Add new testcases.
 
 2011-09-23  Ian Lance Taylor  <iant@google.com>
+           Pierre Vittet  <piervit@pvittet.com>
 
        * md5.c (md5_process_bytes): Correct handling of unaligned
        buffer.