summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-objcopy/COFF/Writer.cpp
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2019-01-22 12:35:34 +0000
committerMartin Storsjo <martin@martin.st>2019-01-22 12:35:34 +0000
commitf614ace3e4db02f17eb1495fcf439d7805e22303 (patch)
treed9a7127d8ef873a0e90b090a143482f70ae219ff /llvm/tools/llvm-objcopy/COFF/Writer.cpp
parentee900efb304ef5780f10a0b0eb5bcea2c3514516 (diff)
downloadbcm5719-llvm-f614ace3e4db02f17eb1495fcf439d7805e22303.tar.gz
bcm5719-llvm-f614ace3e4db02f17eb1495fcf439d7805e22303.zip
Revert "[llvm-objcopy] [COFF] Implement --add-gnu-debuglink"
This reverts commit r351801, as it caused errors on (so far) ppc64be and aarch64 buildbots - the reason is yet unknown. llvm-svn: 351811
Diffstat (limited to 'llvm/tools/llvm-objcopy/COFF/Writer.cpp')
-rw-r--r--llvm/tools/llvm-objcopy/COFF/Writer.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/llvm/tools/llvm-objcopy/COFF/Writer.cpp b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
index 5ea3707e971..4f57131d5ab 100644
--- a/llvm/tools/llvm-objcopy/COFF/Writer.cpp
+++ b/llvm/tools/llvm-objcopy/COFF/Writer.cpp
@@ -286,15 +286,14 @@ void COFFWriter::writeHeaders(bool IsBigObj) {
void COFFWriter::writeSections() {
for (const auto &S : Obj.getSections()) {
uint8_t *Ptr = Buf.getBufferStart() + S.Header.PointerToRawData;
- ArrayRef<uint8_t> Contents = S.getContents();
- std::copy(Contents.begin(), Contents.end(), Ptr);
+ std::copy(S.Contents.begin(), S.Contents.end(), Ptr);
// For executable sections, pad the remainder of the raw data size with
// 0xcc, which is int3 on x86.
if ((S.Header.Characteristics & IMAGE_SCN_CNT_CODE) &&
- S.Header.SizeOfRawData > Contents.size())
- memset(Ptr + Contents.size(), 0xcc,
- S.Header.SizeOfRawData - Contents.size());
+ S.Header.SizeOfRawData > S.Contents.size())
+ memset(Ptr + S.Contents.size(), 0xcc,
+ S.Header.SizeOfRawData - S.Contents.size());
Ptr += S.Header.SizeOfRawData;
for (const auto &R : S.Relocs) {
OpenPOWER on IntegriCloud