diff options
| author | DJ Delorie <dj@redhat.com> | 2011-09-26 23:05:03 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2011-09-26 23:05:03 +0000 |
| commit | 139d7133b8c8fa9af2b78ccab99c15687d08be9a (patch) | |
| tree | c3beb459fd02e2c3a7b5128d98e77e1252eaa288 | |
| parent | 235061c2f42cd86207e5a4e624f4d44ed49a0803 (diff) | |
| download | binutils-139d7133b8c8fa9af2b78ccab99c15687d08be9a.zip binutils-139d7133b8c8fa9af2b78ccab99c15687d08be9a.tar.gz binutils-139d7133b8c8fa9af2b78ccab99c15687d08be9a.tar.bz2 | |
merge from gcc
| -rw-r--r-- | include/plugin-api.h | 11 | ||||
| -rw-r--r-- | libiberty/ChangeLog | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/include/plugin-api.h b/include/plugin-api.h index 122424c..df00393 100644 --- 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 917a2f8..0547f9b 100644 --- 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. |