Index: llvm/test/tools/llvm-objcopy/COFF/update-section.test =================================================================== --- /dev/null +++ llvm/test/tools/llvm-objcopy/COFF/update-section.test @@ -0,0 +1,64 @@ +# RUN: echo -n AAAB > %t.diff +# RUN: echo -n AAA > %t.smaller +# RUN: echo -n AAAAA > %t.larger + +# RUN: yaml2obj %s -o %t + +# RUN: llvm-objcopy --update-section=.text=%t.diff %t - | llvm-readobj -S -x .text - | FileCheck %s +# CHECK: Section { +# CHECK-NEXT: Number: 1 +# CHECK-NEXT: Name: .text +# CHECK: RawDataSize: 4 +# CHECK: Hex dump of section '.text': +# CHECK-NEXT: 0x00000000 41414142 AAAB + +# RUN: llvm-objcopy --update-section=.text=%t.smaller %t - | llvm-readobj -S -x .text - | FileCheck %s --check-prefix=SMALLER +# SMALLER: Section { +# SMALLER-NEXT: Number: 1 +# SMALLER-NEXT: Name: .text +# SMALLER: RawDataSize: 4 +# SMALLER: Hex dump of section '.text': +# SMALLER-NEXT: 0x00000000 41414100 AAA. + +# RUN: llvm-objcopy --update-section=.text=%t.diff --update-section=.other=%t.diff %t - \ +# RUN: | llvm-readobj -S -x .text -x .other - | FileCheck %s --check-prefix=MULTIPLE +# MULTIPLE: Section { +# MULTIPLE-NEXT: Number: 1 +# MULTIPLE-NEXT: Name: .text +# MULTIPLE: RawDataSize: 4 +# MULTIPLE: Section { +# MULTIPLE-NEXT: Number: 2 +# MULTIPLE-NEXT: Name: .other +# MULTIPLE: RawDataSize: 4 +# MULTIPLE: Hex dump of section '.text': +# MULTIPLE-NEXT: 0x00000000 41414142 AAAB +# MULTIPLE: Hex dump of section '.other': +# MULTIPLE-NEXT: 0x00000000 41414142 AAAB + +# RUN: not llvm-objcopy --update-section=.text=%t.larger %t /dev/null 2>&1 | FileCheck %s --check-prefix=TOO-LARGE +# RUN: not llvm-objcopy --update-section=.bss=%t.diff %t /dev/null 2>&1 | FileCheck %s --check-prefix=TOO-LARGE +# TOO-LARGE: error: {{.*}}new section cannot be larger than previous section + +# RUN: not llvm-objcopy --update-section=.text=%t.noexist %t /dev/null + +# RUN: not llvm-objcopy --update-section=.noexist=%t.diff %t /dev/null 2>&1 | FileCheck %s --check-prefix=NO-SECTION +# NO-SECTION: error: {{.*}}could not find section with name '.noexist' + +--- !COFF +header: + Machine: IMAGE_FILE_MACHINE_AMD64 + Characteristics: [ ] +sections: + - Name: .text + Characteristics: [ ] + Alignment: 4 + SectionData: '41414141' + - Name: .other + Characteristics: [ ] + Alignment: 4 + SectionData: '42424242' + - Name: .bss + Characteristics: [ IMAGE_SCN_CNT_UNINITIALIZED_DATA ] + SizeOfRawData: 0 +symbols: +... Index: llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp =================================================================== --- llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp +++ llvm/tools/llvm-objcopy/COFF/COFFObjcopy.cpp @@ -253,6 +253,30 @@ Characteristics); } + for (StringRef Flag : Config.UpdateSection) { + StringRef SecName, FileName; + std::tie(SecName, FileName) = Flag.split("="); + + auto BufOrErr = MemoryBuffer::getFile(FileName); + if (!BufOrErr) + return createFileError(FileName, errorCodeToError(BufOrErr.getError())); + auto Buf = std::move(*BufOrErr); + + auto MutableSections = Obj.getMutableSections(); + auto It = llvm::find_if(MutableSections, [SecName](auto &Sec) { + return Sec.Name == SecName; + }); + if (It == MutableSections.end()) + return createStringError( + errc::invalid_argument, + "could not find section with name '%s'", SecName.str().c_str()); + if (It->getContents().size() < Buf->getBufferSize()) + return createStringError( + errc::invalid_argument, + "new section cannot be larger than previous section"); + It->setOwnedContents({Buf->getBufferStart(), Buf->getBufferEnd()}); + } + if (!Config.AddGnuDebugLink.empty()) if (Error E = addGnuDebugLink(Obj, Config.AddGnuDebugLink)) return E;