Re: [BUILDROBOT] rs6000-ibm-aix4.3 broken in ld/ldlang.c (was: pdp11-aout broken in ld/ldlang.c)

Re: [BUILDROBOT] rs6000-ibm-aix4.3 broken in ld/ldlang.c (was: pdp11-aout broken in ld/ldlang.c)

[Alan Modra]

On Tue, Aug 12, 2014 at 11:08:25PM +0200, Jan-Benedict Glaw wrote:
> > /home/jbglaw/repos/binutils_gdb/ld/ldlang.c:3292: undefined reference to `bfd_elf_get_dyn_lib_class'
> 
> The rs6000-ibm-aix4.3 target is equally affected, see

Oops, and every other non-ELF target too.  I wanted to avoid using
elf-bfd.h in ldlang.c, but there is so much ELF specific code there
already that it hardly seems worth avoiding.

	* ldlang.c (open_input_bfds): Don't use bfd_elf_get_dyn_lib_class.

diff --git a/ld/ldlang.c b/ld/ldlang.c
index 9ca086d..419caa1 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -40,6 +40,7 @@
 #include "demangle.h"
 #include "hashtab.h"
 #include "libbfd.h"
+#include "elf-bfd.h"
 #ifdef ENABLE_PLUGINS
 #include "plugin.h"
 #endif /* ENABLE_PLUGINS */
@@ -3288,8 +3289,7 @@ open_input_bfds (lang_statement_union_type *s, enum open_bfd_mode mode)
 			  && ((abfd->flags) & DYNAMIC) != 0
 			  && s->input_statement.flags.add_DT_NEEDED_for_regular
 			  && bfd_get_flavour (abfd) == bfd_target_elf_flavour
-			  && (bfd_elf_get_dyn_lib_class (abfd)
-			      & DYN_AS_NEEDED) != 0)))
+			  && (elf_dyn_lib_class (abfd) & DYN_AS_NEEDED) != 0)))
 		{
 		  s->input_statement.flags.loaded = FALSE;
 		  s->input_statement.flags.reload = TRUE;

-- 
Alan Modra
Australia Development Lab, IBM