* libbfd.c (bfd_put_8): Make it of type `void'.

	* bfd-in2.h: Regenerated.
	* elf32-mips.c (MIPS_ELF_ADD_DYNAMIC_ENTRY): Conditionalize
	for 32-bit hosts.
	(_bfd_mips_elf_final_link): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c2b99d398a853de0d40523d522d466efdc1ff674..8d327d29c72153b2991f79be4ccda287a254c9df 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,11 @@
 1999-07-11  Mark Mitchell  <mark@codesourcery.com>
 
+       * libbfd.c (bfd_put_8): Make it of type `void'.
+       * bfd-in2.h: Regenerated.
+       * elf32-mips.c (MIPS_ELF_ADD_DYNAMIC_ENTRY): Conditionalize
+       for 32-bit hosts.
+       (_bfd_mips_elf_final_link): Likewise.
+
        * elflink.h (elf_link_read_relocs_from_section): Be type-correct.
 
 Thu Jul  8 12:32:23 1999  John David Anglin <dave@hiauly1.hia.nrc.ca>

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index aa20c0817cd03b4c7e22d21b6ad372d519d2c9dd..93eba0d609f04f9849ac9f6eb6e882430d9aa1fe 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -768,7 +768,7 @@ bfd_make_readable PARAMS ((bfd *abfd));
  /* Byte swapping macros for user section data.  */
 
 #define bfd_put_8(abfd, val, ptr) \
-                (*((unsigned char *)(ptr)) = (unsigned char)(val))
+                ((void) (*((unsigned char *)(ptr)) = (unsigned char)(val)))
 #define bfd_put_signed_8 \
                bfd_put_8
 #define bfd_get_8(abfd, ptr) \

diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 55863fe8226d68fab61eb0520643e7a72f5d30ea..ec53e92a0b1a878d3f1afab0f3a627e6817b8b7f 100644 (file)
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -269,10 +269,17 @@ typedef enum {
    : bfd_put_32 (abfd, val, ptr))
 
 /* Add a dynamic symbol table-entry.  */
+#ifdef BFD64
 #define MIPS_ELF_ADD_DYNAMIC_ENTRY(info, tag, val) \
   (ABI_64_P (elf_hash_table (info)->dynobj)       \
    ? bfd_elf64_add_dynamic_entry (info, tag, val)  \
    : bfd_elf32_add_dynamic_entry (info, tag, val))
+#else
+#define MIPS_ELF_ADD_DYNAMIC_ENTRY(info, tag, val) \
+  (ABI_64_P (elf_hash_table (info)->dynobj)       \
+   ? bfd_elf64_add_dynamic_entry (info, tag, val)  \
+   : (abort (), false))
+#endif
 
 /* The number of local .got entries we reserve.  */
 #define MIPS_RESERVED_GOTNO (2)
@@ -4891,10 +4898,18 @@ _bfd_mips_elf_final_link (abfd, info)
     }
 
   /* Invoke the regular ELF backend linker to do all the work.  */
-  if (!(ABI_64_P (abfd) 
-       ? bfd_elf64_bfd_final_link (abfd, info)
-       : bfd_elf32_bfd_final_link (abfd, info)))
+  if (ABI_64_P (abfd))
+    {
+#ifdef BFD64
+      if (!bfd_elf64_bfd_final_link (abfd, info))
+       return false;
+#else
+      abort ();
       return false;
+#endif /* BFD64 */
+    }
+  else if (!bfd_elf32_bfd_final_link (abfd, info))
+    return false;
 
   /* Now write out the computed sections.  */
 

diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 23a27e3257cab6a9bda5b33486e594225a6fa306..d2fee39edeb91dc83fb64cd8d46d3376286dcfcd 100644 (file)
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -792,7 +792,7 @@ DESCRIPTION
 .{* Byte swapping macros for user section data.  *}
 .
 .#define bfd_put_8(abfd, val, ptr) \
-.                (*((unsigned char *)(ptr)) = (unsigned char)(val))
+.                ((void) (*((unsigned char *)(ptr)) = (unsigned char)(val)))
 .#define bfd_put_signed_8 \
 .              bfd_put_8
 .#define bfd_get_8(abfd, ptr) \