diff options
| author | obrien <obrien@FreeBSD.org> | 2002-04-12 19:33:52 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2002-04-12 19:33:52 +0000 |
| commit | 18ff9f4f1bddd11c341a37177885ac89fcccedd9 (patch) | |
| tree | b6180daa6d6e558ce86214f98d103e01ff4e70ff /contrib/binutils/bfd/merge.c | |
| parent | 1d1ccbf8e10277966ecf3c150370a50c9e184b35 (diff) | |
| download | FreeBSD-src-18ff9f4f1bddd11c341a37177885ac89fcccedd9.zip FreeBSD-src-18ff9f4f1bddd11c341a37177885ac89fcccedd9.tar.gz | |
Import of Binutils from the FSF 2.12 branch.
(this fixes several linker problems and coredumps)
These bits are taken from the FSF anoncvs repo on 10-April-2002 13:24 Zulu
Diffstat (limited to 'contrib/binutils/bfd/merge.c')
| -rw-r--r-- | contrib/binutils/bfd/merge.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/binutils/bfd/merge.c b/contrib/binutils/bfd/merge.c index 7b06c10..e175efd 100644 --- a/contrib/binutils/bfd/merge.c +++ b/contrib/binutils/bfd/merge.c @@ -804,6 +804,9 @@ _bfd_merge_sections (abfd, xsinfo, remove_hook) if (secinfo) continue; + if (sinfo->htab->first == NULL) + continue; + if (sinfo->htab->strings) merge_strings (sinfo); else |
