From 2504df11e1275f63f4c53377bf91eee996360cb5 Mon Sep 17 00:00:00 2001 From: obrien Date: Wed, 16 Jun 2004 05:45:41 +0000 Subject: Import of Binutils from the FSF 2.15 branch (just post-.0 release). These bits are taken from the FSF anoncvs repo on 23-May-2004 04:41:00 UTC. --- contrib/binutils/bfd/elf64-gen.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'contrib/binutils/bfd/elf64-gen.c') diff --git a/contrib/binutils/bfd/elf64-gen.c b/contrib/binutils/bfd/elf64-gen.c index a58f6ac..be1dc3e 100644 --- a/contrib/binutils/bfd/elf64-gen.c +++ b/contrib/binutils/bfd/elf64-gen.c @@ -1,5 +1,6 @@ /* Generic support for 64-bit ELF - Copyright 1993, 1995, 1998, 1999, 2001 Free Software Foundation, Inc. + Copyright 1993, 1995, 1998, 1999, 2001, 2002, 2004 + Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -30,28 +31,28 @@ static reloc_howto_type dummy = 0, /* rightshift */ 0, /* size (0 = byte, 1 = short, 2 = long) */ 0, /* bitsize */ - false, /* pc_relative */ + FALSE, /* pc_relative */ 0, /* bitpos */ complain_overflow_dont, /* complain_on_overflow */ NULL, /* special_function */ "UNKNOWN", /* name */ - false, /* partial_inplace */ + FALSE, /* partial_inplace */ 0, /* src_mask */ 0, /* dst_mask */ - false); /* pcrel_offset */ + FALSE); /* pcrel_offset */ static void elf_generic_info_to_howto - PARAMS ((bfd *, arelent *, Elf64_Internal_Rela *)); + PARAMS ((bfd *, arelent *, Elf_Internal_Rela *)); static void elf_generic_info_to_howto_rel - PARAMS ((bfd *, arelent *, Elf64_Internal_Rel *)); -static boolean elf64_generic_link_add_symbols + PARAMS ((bfd *, arelent *, Elf_Internal_Rela *)); +static bfd_boolean elf64_generic_link_add_symbols PARAMS ((bfd *, struct bfd_link_info *)); static void elf_generic_info_to_howto (abfd, bfd_reloc, elf_reloc) bfd *abfd ATTRIBUTE_UNUSED; arelent *bfd_reloc; - Elf64_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED; + Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED; { bfd_reloc->howto = &dummy; } @@ -60,12 +61,12 @@ static void elf_generic_info_to_howto_rel (abfd, bfd_reloc, elf_reloc) bfd *abfd ATTRIBUTE_UNUSED; arelent *bfd_reloc; - Elf64_Internal_Rel *elf_reloc ATTRIBUTE_UNUSED; + Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED; { bfd_reloc->howto = &dummy; } -static boolean +static bfd_boolean elf64_generic_link_add_symbols (abfd, info) bfd *abfd; struct bfd_link_info *info; @@ -84,10 +85,10 @@ elf64_generic_link_add_symbols (abfd, info) ehdrp->e_machine); bfd_set_error (bfd_error_wrong_format); - return false; + return FALSE; } - return bfd_elf64_bfd_link_add_symbols (abfd, info); + return bfd_elf_link_add_symbols (abfd, info); } #define TARGET_LITTLE_SYM bfd_elf64_little_generic_vec -- cgit v1.1