diff options
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 2 | ||||
| -rw-r--r-- | bfd/bfd.c | 2 | ||||
| -rw-r--r-- | bfd/plugin.c | 2 | ||||
| -rw-r--r-- | ld/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/plugin.c | 2 |
6 files changed, 17 insertions, 4 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 2173fc9..187a049 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,13 @@ 2016-06-18 H.J. Lu <hongjiu.lu@intel.com> + * bfd.c (bfd_plugin_format): Rename bfd_plugin_uknown to + bfd_plugin_unknown. + * bfd-in2.h: Regenerated. + * plugin.c (bfd_plugin_object_p): Replace bfd_plugin_uknown + with bfd_plugin_unknown. + +2016-06-18 H.J. Lu <hongjiu.lu@intel.com> + PR ld/20253 * elf-bfd.h (_bfd_elf_allocate_ifunc_dyn_relocs): Add an bfd_boolean argument. diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 6489c60..af950a0 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -6544,7 +6544,7 @@ enum bfd_direction enum bfd_plugin_format { - bfd_plugin_uknown = 0, + bfd_plugin_unknown = 0, bfd_plugin_yes = 1, bfd_plugin_no = 2 }; @@ -46,7 +46,7 @@ CODE_FRAGMENT . .enum bfd_plugin_format . { -. bfd_plugin_uknown = 0, +. bfd_plugin_unknown = 0, . bfd_plugin_yes = 1, . bfd_plugin_no = 2 . }; diff --git a/bfd/plugin.c b/bfd/plugin.c index 559fcd4..2ab3452 100644 --- a/bfd/plugin.c +++ b/bfd/plugin.c @@ -365,7 +365,7 @@ bfd_plugin_object_p (bfd *abfd) if (ld_plugin_object_p) return ld_plugin_object_p (abfd); - if (abfd->plugin_format == bfd_plugin_uknown && !load_plugin (abfd)) + if (abfd->plugin_format == bfd_plugin_unknown && !load_plugin (abfd)) return NULL; return abfd->plugin_format == bfd_plugin_yes ? abfd->xvec : NULL; diff --git a/ld/ChangeLog b/ld/ChangeLog index 09de0c7..b9b9c3e 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,10 @@ 2016-06-18 H.J. Lu <hongjiu.lu@intel.com> + * plugin.c (plugin_object_p): Replace bfd_plugin_uknown + with bfd_plugin_unknown. + +2016-06-18 H.J. Lu <hongjiu.lu@intel.com> + PR ld/20253 * testsuite/ld-i386/i386.exp: Run PR ld/20253 tests. * testsuite/ld-i386/no-plt.exp: Likewise. diff --git a/ld/plugin.c b/ld/plugin.c index ebde25f..cb61318 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -1081,7 +1081,7 @@ plugin_object_p (bfd *ibfd) if ((ibfd->flags & BFD_PLUGIN) != 0) return NULL; - if (ibfd->plugin_format != bfd_plugin_uknown) + if (ibfd->plugin_format != bfd_plugin_unknown) { if (ibfd->plugin_format == bfd_plugin_yes) return ibfd->plugin_dummy_bfd->xvec; |