* 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.
This commit is contained in:
Mark Mitchell
1999-07-11 09:28:45 +00:00
parent 65388f2d50
commit 9ebbd33e6f
4 changed files with 26 additions and 5 deletions

View File

@ -1,5 +1,11 @@
1999-07-11 Mark Mitchell <mark@codesourcery.com> 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. * 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> Thu Jul 8 12:32:23 1999 John David Anglin <dave@hiauly1.hia.nrc.ca>

View File

@ -768,7 +768,7 @@ bfd_make_readable PARAMS ((bfd *abfd));
/* Byte swapping macros for user section data. */ /* Byte swapping macros for user section data. */
#define bfd_put_8(abfd, val, ptr) \ #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 \ #define bfd_put_signed_8 \
bfd_put_8 bfd_put_8
#define bfd_get_8(abfd, ptr) \ #define bfd_get_8(abfd, ptr) \

View File

@ -269,10 +269,17 @@ typedef enum {
: bfd_put_32 (abfd, val, ptr)) : bfd_put_32 (abfd, val, ptr))
/* Add a dynamic symbol table-entry. */ /* Add a dynamic symbol table-entry. */
#ifdef BFD64
#define MIPS_ELF_ADD_DYNAMIC_ENTRY(info, tag, val) \ #define MIPS_ELF_ADD_DYNAMIC_ENTRY(info, tag, val) \
(ABI_64_P (elf_hash_table (info)->dynobj) \ (ABI_64_P (elf_hash_table (info)->dynobj) \
? bfd_elf64_add_dynamic_entry (info, tag, val) \ ? bfd_elf64_add_dynamic_entry (info, tag, val) \
: bfd_elf32_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. */ /* The number of local .got entries we reserve. */
#define MIPS_RESERVED_GOTNO (2) #define MIPS_RESERVED_GOTNO (2)
@ -4891,9 +4898,17 @@ _bfd_mips_elf_final_link (abfd, info)
} }
/* Invoke the regular ELF backend linker to do all the work. */ /* Invoke the regular ELF backend linker to do all the work. */
if (!(ABI_64_P (abfd) if (ABI_64_P (abfd))
? bfd_elf64_bfd_final_link (abfd, info) {
: bfd_elf32_bfd_final_link (abfd, info))) #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; return false;
/* Now write out the computed sections. */ /* Now write out the computed sections. */

View File

@ -792,7 +792,7 @@ DESCRIPTION
.{* Byte swapping macros for user section data. *} .{* Byte swapping macros for user section data. *}
. .
.#define bfd_put_8(abfd, val, ptr) \ .#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 \ .#define bfd_put_signed_8 \
. bfd_put_8 . bfd_put_8
.#define bfd_get_8(abfd, ptr) \ .#define bfd_get_8(abfd, ptr) \