From c8e7bf0d21a314ffac1844b5644b2dc454196570 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 22 Mar 2005 16:14:43 +0000 Subject: Convert to ISO C90 formatting. --- bfd/elf32-gen.c | 85 +++++++++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 45 deletions(-) (limited to 'bfd/elf32-gen.c') diff --git a/bfd/elf32-gen.c b/bfd/elf32-gen.c index 09cc5a1..818e3a9 100644 --- a/bfd/elf32-gen.c +++ b/bfd/elf32-gen.c @@ -1,22 +1,22 @@ /* Generic support for 32-bit ELF - Copyright 1993, 1995, 1998, 1999, 2001, 2002, 2004 + Copyright 1993, 1995, 1998, 1999, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. -This file is part of BFD, the Binary File Descriptor library. + This file is part of BFD, the Binary File Descriptor library. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "bfd.h" #include "sysdep.h" @@ -41,53 +41,48 @@ static reloc_howto_type dummy = 0, /* dst_mask */ FALSE); /* pcrel_offset */ -static void elf_generic_info_to_howto - PARAMS ((bfd *, arelent *, Elf_Internal_Rela *)); -static void elf_generic_info_to_howto_rel - PARAMS ((bfd *, arelent *, Elf_Internal_Rela *)); -static bfd_boolean elf32_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; - Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED; +elf_generic_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, + arelent *bfd_reloc, + Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED) { bfd_reloc->howto = &dummy; } static void -elf_generic_info_to_howto_rel (abfd, bfd_reloc, elf_reloc) - bfd *abfd ATTRIBUTE_UNUSED; - arelent *bfd_reloc; - Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED; +elf_generic_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED, + arelent *bfd_reloc, + Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED) { bfd_reloc->howto = &dummy; } -static bfd_boolean -elf32_generic_link_add_symbols (abfd, info) - bfd *abfd; - struct bfd_link_info *info; +static void +check_for_relocs (bfd * abfd, asection * o, void * failed) { - asection *o; + if ((o->flags & SEC_RELOC) != 0) + { + Elf_Internal_Ehdr *ehdrp; - /* Check if there are any relocations. */ - for (o = abfd->sections; o != NULL; o = o->next) - if ((o->flags & SEC_RELOC) != 0) - { - Elf_Internal_Ehdr *ehdrp; + ehdrp = elf_elfheader (abfd); + _bfd_error_handler (_("%B: Relocations in generic ELF (EM: %d)"), + abfd, ehdrp->e_machine); - ehdrp = elf_elfheader (abfd); - (*_bfd_error_handler) (_("%B: Relocations in generic ELF (EM: %d)"), - abfd, - ehdrp->e_machine); + bfd_set_error (bfd_error_wrong_format); + * (bfd_boolean *) failed = TRUE; + } +} - bfd_set_error (bfd_error_wrong_format); - return FALSE; - } +static bfd_boolean +elf32_generic_link_add_symbols (bfd *abfd, struct bfd_link_info *info) +{ + bfd_boolean failed = FALSE; + + /* Check if there are any relocations. */ + bfd_map_over_sections (abfd, check_for_relocs, & failed); + if (failed) + return FALSE; return bfd_elf_link_add_symbols (abfd, info); } -- cgit v1.1