summaryrefslogtreecommitdiff
path: root/bfd/merge.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2001-09-21 02:12:29 +0000
committerAlan Modra <amodra@bigpond.net.au>2001-09-21 02:12:29 +0000
commit7bdaa2bb9defce74afa0a21ee23baf28efcd5290 (patch)
tree3c8fd88b13a2770579c1885a6e6414dfdf839d70 /bfd/merge.c
parent3952f931f3efcaa3d631307b72edfab7171d0987 (diff)
downloadgdb-7bdaa2bb9defce74afa0a21ee23baf28efcd5290.tar.gz
* Makefile.am: Run "make dep-am".
* Makefile.in: Regenerate. * doc/Makefile.in: Regenerate. * aoutx.h: Formatting fixes. * merge.c (_bfd_merged_section_offset): Break line at 80 chars. * linker.c: Replace bfd_get_filename with bfd_archive_filename in error message.
Diffstat (limited to 'bfd/merge.c')
-rw-r--r--bfd/merge.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/bfd/merge.c b/bfd/merge.c
index 2170e4e43e6..d3586feb69d 100644
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -887,9 +887,11 @@ _bfd_merged_section_offset (output_bfd, psec, psecinfo, offset, addend)
if (offset + addend >= sec->_raw_size)
{
if (offset + addend > sec->_raw_size)
- (*_bfd_error_handler) (_("%s: access beyond end of merged section (%ld + %ld)"),
- bfd_get_filename (sec->owner), (long)offset,
- (long) addend);
+ {
+ (*_bfd_error_handler)
+ (_("%s: access beyond end of merged section (%ld + %ld)"),
+ bfd_get_filename (sec->owner), (long) offset, (long) addend);
+ }
return (secinfo->first ? sec->_cooked_size : 0);
}