summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2017-06-22 21:02:14 +0000
committerReid Kleckner <rnk@google.com>2017-06-22 21:02:14 +0000
commit40a47a870294cdc0bacb40d6a66e18781fd40d32 (patch)
treecb033e8e16f22d4a78a495b5d54076ca0d4d5ae9 /llvm
parent9940203a2cffb678ee3c393dda03023bdf137646 (diff)
downloadbcm5719-llvm-40a47a870294cdc0bacb40d6a66e18781fd40d32.tar.gz
bcm5719-llvm-40a47a870294cdc0bacb40d6a66e18781fd40d32.zip
[MC] Allow assembling .secidx and .secrel32 for undefined symbols
There's nothing incorrect about emitting such relocations against symbols defined in other objects. The code in EmitCOFFSec* was missing the visitUsedExpr part of MCStreamer::EmitValueImpl, so these symbols were not being registered with the object file assembler. This will be used to make reduced test cases for LLD. llvm-svn: 306057
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/MC/MCWinCOFFStreamer.cpp6
-rw-r--r--llvm/test/MC/COFF/secidx-diagnostic.s10
-rw-r--r--llvm/test/MC/COFF/secrel32-undef.s30
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)
OpenPOWER on IntegriCloud