From 5ff625e9757a8839b58ee06e09844dc97b6c23d4 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 16 Feb 2005 02:38:53 +0000 Subject: [PATCH] * coff-arm.c (coff_arm_is_local_label_name): Warning fix. * elf32-frv.c (frvfdpic_relocs_info_hash): Likewise. * pef.c (bfd_pef_scan): Don't ignore return value of bfd_pef_scan_start_address. --- bfd/ChangeLog | 7 +++++++ bfd/coff-arm.c | 6 ++++-- bfd/elf32-frv.c | 4 ++-- bfd/pef.c | 4 ++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 21dd79f..b0633b9 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,12 @@ 2005-02-16 Alan Modra + * coff-arm.c (coff_arm_is_local_label_name): Warning fix. + * elf32-frv.c (frvfdpic_relocs_info_hash): Likewise. + * pef.c (bfd_pef_scan): Don't ignore return value of + bfd_pef_scan_start_address. + +2005-02-16 Alan Modra + * elf64-ppc.c (ppc64_elf_edit_toc): Skip toc if size is zero. Skip toc reloc adjust if reloc_count is zero. diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c index c6580a8..c336285 100644 --- a/bfd/coff-arm.c +++ b/bfd/coff-arm.c @@ -1,6 +1,6 @@ /* BFD back-end for ARM COFF files. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004 + 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Written by Cygnus Support. @@ -2504,7 +2504,9 @@ coff_arm_is_local_label_name (abfd, name) #ifdef USER_LABEL_PREFIX if (USER_LABEL_PREFIX[0] != 0) { - if (strncmp (name, USER_LABEL_PREFIX, strlen (USER_LABEL_PREFIX)) == 0) + size_t len = strlen (USER_LABEL_PREFIX); + + if (strncmp (name, USER_LABEL_PREFIX, len) == 0) return FALSE; } #endif diff --git a/bfd/elf32-frv.c b/bfd/elf32-frv.c index 009507a..15f469e 100644 --- a/bfd/elf32-frv.c +++ b/bfd/elf32-frv.c @@ -1144,8 +1144,8 @@ frvfdpic_relocs_info_hash (const void *entry_) const struct frvfdpic_relocs_info *entry = entry_; return (entry->symndx == -1 - ? (long)entry->d.h->root.root.hash - : entry->symndx + entry->d.abfd->id * 257) + entry->addend; + ? (long) entry->d.h->root.root.hash + : entry->symndx + (long) entry->d.abfd->id * 257) + entry->addend; } /* Test whether the key fields of two frvfdpic_relocs_info entries are diff --git a/bfd/pef.c b/bfd/pef.c index 7f266c5..22d302f 100644 --- a/bfd/pef.c +++ b/bfd/pef.c @@ -1,5 +1,5 @@ /* PEF support for BFD. - Copyright 1999, 2000, 2001, 2002, 2003, 2004 + Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -600,7 +600,7 @@ bfd_pef_scan (abfd, header, mdata) } if (bfd_pef_scan_start_address (abfd) < 0) - ; + return -1; abfd->tdata.pef_data = mdata; -- 2.7.4