diff options
| author | Alan Modra <amodra@gmail.com> | 2001-09-21 02:12:29 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2001-09-21 02:12:29 +0000 |
| commit | 923f08ff7ac991107941902e255b1e600ed3d359 (patch) | |
| tree | affad952984adfe408c7ad9e2b009eb6681bc697 /bfd/merge.c | |
| parent | a10bc936b8b5bb0a1c9dd26e5cb746714cd20c37 (diff) | |
| download | fsf-binutils-gdb-923f08ff7ac991107941902e255b1e600ed3d359.zip fsf-binutils-gdb-923f08ff7ac991107941902e255b1e600ed3d359.tar.gz fsf-binutils-gdb-923f08ff7ac991107941902e255b1e600ed3d359.tar.bz2 | |
* 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.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bfd/merge.c b/bfd/merge.c index 2170e4e..d3586fe 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); } |