diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2018-01-06 16:13:17 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2018-01-06 16:13:17 +0000 |
| commit | 4b49587c3dd54aed8eb103d838a89ca79484a9b6 (patch) | |
| tree | 8d1f68ff31be5f870301008c5e1fbec515c62456 /contrib | |
| parent | ec2bf1e7b1ae8c4cf33cfb59946a3e0ee24a455d (diff) | |
| parent | 90daf40223abf16e2bbc91f50309f1e19431e0b6 (diff) | |
| download | src-4b49587c3dd54aed8eb103d838a89ca79484a9b6.tar.gz src-4b49587c3dd54aed8eb103d838a89ca79484a9b6.zip | |
Merge ^/head r327341 through r327623.
Notes
Notes:
svn path=/projects/clang600-import/; revision=327624
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/elftoolchain/elfcopy/binary.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/elftoolchain/elfcopy/binary.c b/contrib/elftoolchain/elfcopy/binary.c index ad86a6533c55..0b56ae0566cd 100644 --- a/contrib/elftoolchain/elfcopy/binary.c +++ b/contrib/elftoolchain/elfcopy/binary.c @@ -101,10 +101,10 @@ create_binary(int ifd, int ofd) sh.sh_size == 0) continue; (void) elf_errno(); - if ((d = elf_getdata(scn, NULL)) == NULL) { + if ((d = elf_rawdata(scn, NULL)) == NULL) { elferr = elf_errno(); if (elferr != 0) - warnx("elf_getdata failed: %s", elf_errmsg(-1)); + warnx("elf_rawdata failed: %s", elf_errmsg(-1)); continue; } if (d->d_buf == NULL || d->d_size == 0) |