* bfd-in.h (struct bfd_link_needed_list): Rename from

	bfd_elf_link_needed_list.
	* bfd-in2.h: Rebuild.
	* elf.c, elflink.h, libelf.h: Corresponding changes.

5 files changed, 31 insertions, 19 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 43f97ad..1a9942c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -4,6 +4,11 @@ Mon Oct 16 14:43:59 1995  steve chamberlain  <sac@slash.cygnus.com>
 
 Mon Oct 16 10:52:50 1995  Ian Lance Taylor  <ian@cygnus.com>
 
+	* bfd-in.h (struct bfd_link_needed_list): Rename from
+	bfd_elf_link_needed_list.
+	* bfd-in2.h: Rebuild.
+	* elf.c, elflink.h, libelf.h: Corresponding changes.
+
 	Add start at AIX linker support; no shared libraries yet.
 	* xcofflink.c: New file.
 	* configure.in (rs600coff_vec): Use xcofflink.o.
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index afb907f..c20fb16 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -88,6 +88,11 @@ typedef struct _bfd bfd;
 #if defined (__GNUG__) && (__GNUC_MINOR__ > 5)
 #define TRUE_FALSE_ALREADY_DEFINED
 #endif
+#ifdef MPW
+/* Pre-emptive strike - get the file with the enum. */
+#include <Types.h>
+#define TRUE_FALSE_ALREADY_DEFINED
+#endif /* MPW */
 #ifndef TRUE_FALSE_ALREADY_DEFINED
 typedef enum bfd_boolean {false, true} boolean;
 #define BFD_TRUE_FALSE
@@ -558,17 +563,18 @@ extern boolean bfd_mips_ecoff_create_embedded_relocs
 
 /* Externally visible ELF routines.  */
 
-extern boolean bfd_elf32_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
-extern boolean bfd_elf64_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
-struct bfd_elf_link_needed_list
+struct bfd_link_needed_list
 {
-  struct bfd_elf_link_needed_list *next;
+  struct bfd_link_needed_list *next;
   bfd *by;
   const char *name;
 };
-extern struct bfd_elf_link_needed_list *bfd_elf_get_needed_list
+
+extern boolean bfd_elf32_record_link_assignment
+  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
+extern boolean bfd_elf64_record_link_assignment
+  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
+extern struct bfd_link_needed_list *bfd_elf_get_needed_list
   PARAMS ((bfd *, struct bfd_link_info *));
 extern boolean bfd_elf32_size_dynamic_sections
   PARAMS ((bfd *, const char *, const char *, boolean,
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index d6e16a9..5285a15 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -563,17 +563,18 @@ extern boolean bfd_mips_ecoff_create_embedded_relocs
 
 /* Externally visible ELF routines.  */
 
-extern boolean bfd_elf32_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
-extern boolean bfd_elf64_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
-struct bfd_elf_link_needed_list
+struct bfd_link_needed_list
 {
-  struct bfd_elf_link_needed_list *next;
+  struct bfd_link_needed_list *next;
   bfd *by;
   const char *name;
 };
-extern struct bfd_elf_link_needed_list *bfd_elf_get_needed_list
+
+extern boolean bfd_elf32_record_link_assignment
+  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
+extern boolean bfd_elf64_record_link_assignment
+  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
+extern struct bfd_link_needed_list *bfd_elf_get_needed_list
   PARAMS ((bfd *, struct bfd_link_info *));
 extern boolean bfd_elf32_size_dynamic_sections
   PARAMS ((bfd *, const char *, const char *, boolean,
@@ -1872,6 +1873,7 @@ struct _bfd
       struct _oasys_ar_data *oasys_ar_data;
       struct coff_tdata *coff_obj_data;
       struct pe_tdata *pe_obj_data;
+      struct xcoff_tdata *xcoff_obj_data;
       struct ecoff_tdata *ecoff_obj_data;
       struct ieee_data_struct *ieee_data;
       struct ieee_ar_data_struct *ieee_ar_data;
diff --git a/bfd/elflink.h b/bfd/elflink.h
index 86328d6..f324ebb 100644
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -442,12 +442,11 @@ elf_link_add_object_symbols (abfd, info)
 		}
 	      if (dyn.d_tag == DT_NEEDED)
 		{
-		  struct bfd_elf_link_needed_list *n, **pn;
+		  struct bfd_link_needed_list *n, **pn;
 		  char *fnm, *anm;
 
-		  n = (struct bfd_elf_link_needed_list *)
-		    bfd_alloc (abfd,
-			       sizeof (struct bfd_elf_link_needed_list));
+		  n = ((struct bfd_link_needed_list *)
+		       bfd_alloc (abfd, sizeof (struct bfd_link_needed_list)));
 		  fnm = bfd_elf_string_from_elf_section (abfd, link,
 							 dyn.d_un.d_val);
 		  if (n == NULL || fnm == NULL)
diff --git a/bfd/libelf.h b/bfd/libelf.h
index 92c0bc2..f90f2b0 100644
--- a/bfd/libelf.h
+++ b/bfd/libelf.h
@@ -146,7 +146,7 @@ struct elf_link_hash_table
   size_t bucketcount;
   /* A linked list of DT_NEEDED names found in dynamic objects
      included in the link.  */
-  struct bfd_elf_link_needed_list *needed;
+  struct bfd_link_needed_list *needed;
 };
 
 /* Look up an entry in an ELF linker hash table.  */