diff options
| -rw-r--r-- | llvm/lib/MC/MCWinCOFFStreamer.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/MC/COFF/secidx-diagnostic.s | 10 | ||||
| -rw-r--r-- | llvm/test/MC/COFF/secrel32-undef.s | 30 |
3 files changed, 34 insertions, 12 deletions
diff --git a/llvm/lib/MC/MCWinCOFFStreamer.cpp b/llvm/lib/MC/MCWinCOFFStreamer.cpp index dc5c21190de..bf341bb1f45 100644 --- a/llvm/lib/MC/MCWinCOFFStreamer.cpp +++ b/llvm/lib/MC/MCWinCOFFStreamer.cpp @@ -190,7 +190,8 @@ void MCWinCOFFStreamer::EmitCOFFSafeSEH(MCSymbol const *Symbol) { << COFF::SCT_COMPLEX_TYPE_SHIFT); } -void MCWinCOFFStreamer::EmitCOFFSectionIndex(MCSymbol const *Symbol) { +void MCWinCOFFStreamer::EmitCOFFSectionIndex(const MCSymbol *Symbol) { + visitUsedSymbol(*Symbol); MCDataFragment *DF = getOrCreateDataFragment(); const MCSymbolRefExpr *SRE = MCSymbolRefExpr::create(Symbol, getContext()); MCFixup Fixup = MCFixup::create(DF->getContents().size(), SRE, FK_SecRel_2); @@ -198,8 +199,9 @@ void MCWinCOFFStreamer::EmitCOFFSectionIndex(MCSymbol const *Symbol) { DF->getContents().resize(DF->getContents().size() + 2, 0); } -void MCWinCOFFStreamer::EmitCOFFSecRel32(MCSymbol const *Symbol, +void MCWinCOFFStreamer::EmitCOFFSecRel32(const MCSymbol *Symbol, uint64_t Offset) { + visitUsedSymbol(*Symbol); MCDataFragment *DF = getOrCreateDataFragment(); // Create Symbol A for the relocation relative reference. const MCExpr *MCE = MCSymbolRefExpr::create(Symbol, getContext()); diff --git a/llvm/test/MC/COFF/secidx-diagnostic.s b/llvm/test/MC/COFF/secidx-diagnostic.s deleted file mode 100644 index aacf7f86280..00000000000 --- a/llvm/test/MC/COFF/secidx-diagnostic.s +++ /dev/null @@ -1,10 +0,0 @@ -// RUN: not llvm-mc -filetype=obj -triple i686-pc-win32 %s 2>%t -// RUN: FileCheck %s < %t - -// CHECK: symbol 'bar' can not be undefined -// CHECK: symbol 'baz' can not be undefined - -.data -foo: - .secidx bar - .secidx baz diff --git a/llvm/test/MC/COFF/secrel32-undef.s b/llvm/test/MC/COFF/secrel32-undef.s new file mode 100644 index 00000000000..3a725ab8950 --- /dev/null +++ b/llvm/test/MC/COFF/secrel32-undef.s @@ -0,0 +1,30 @@ +# RUN: llvm-mc -filetype=obj -triple i686-pc-win32 %s -o %t.obj +# RUN: llvm-readobj -symbols -relocations %t.obj | FileCheck %s + +# Previously .secrel32 and .secidx relocations against undefined symbols +# resulted in an error. That was a mistake. The linker is fully capable of +# resolving these relocations against symbols in other object files. Such +# relocations can be found in the MSVCRT debug info describing linker-provided +# symbols like __safe_se_handler_table and __guard_fids_table. + +.data +foo: + .secrel32 bar + .secidx baz + + +# CHECK: Relocations [ +# CHECK: Section (2) .data { +# CHECK: 0x0 IMAGE_REL_I386_SECREL bar +# CHECK: 0x4 IMAGE_REL_I386_SECTION baz +# CHECK: } +# CHECK: ] + +# CHECK: Symbol { +# CHECK: Name: bar +# CHECK-NEXT: Value: 0 +# CHECK-NEXT: Section: IMAGE_SYM_UNDEFINED (0) +# CHECK: Symbol { +# CHECK: Name: baz +# CHECK-NEXT: Value: 0 +# CHECK-NEXT: Section: IMAGE_SYM_UNDEFINED (0) |
