summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2017-06-28 17:56:07 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2017-06-28 17:56:07 +0000
commit96367a3d1e94f27ad99bcf18acf7000837be555f (patch)
treee9efabc6a7d8c8e16b57733af389e1d13093b345 /llvm
parentf43d34a526821460a8e209b59a339242b556c433 (diff)
downloadbcm5719-llvm-96367a3d1e94f27ad99bcf18acf7000837be555f.tar.gz
bcm5719-llvm-96367a3d1e94f27ad99bcf18acf7000837be555f.zip
Fix PR33625.
We were failing to convert this expression to pcrel. llvm-svn: 306573
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp2
-rw-r--r--llvm/test/MC/X86/signed-coff-pcrel.s12
2 files changed, 13 insertions, 1 deletions
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp
index 5892f1de33e..807f7a6ddb1 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86WinCOFFObjectWriter.cpp
@@ -44,7 +44,7 @@ unsigned X86WinCOFFObjectWriter::getRelocType(MCContext &Ctx,
const MCAsmBackend &MAB) const {
unsigned FixupKind = Fixup.getKind();
if (IsCrossSection) {
- if (FixupKind != FK_Data_4) {
+ if (FixupKind != FK_Data_4 && FixupKind != llvm::X86::reloc_signed_4byte) {
Ctx.reportError(Fixup.getLoc(), "Cannot represent this expression");
return COFF::IMAGE_REL_AMD64_ADDR32;
}
diff --git a/llvm/test/MC/X86/signed-coff-pcrel.s b/llvm/test/MC/X86/signed-coff-pcrel.s
new file mode 100644
index 00000000000..768947bbf80
--- /dev/null
+++ b/llvm/test/MC/X86/signed-coff-pcrel.s
@@ -0,0 +1,12 @@
+// RUN: llvm-mc -triple i686-unknown-windows-msvc -filetype obj -o %t.o %s
+// RUN: llvm-objdump -r %t.o | FileCheck %s
+
+// CHECK: 00000004 IMAGE_REL_I386_REL32 twop32
+
+ .section .rdata,"rd"
+twop32:
+ .quad 0x41f0000000000000
+
+ .text
+0:
+ mulsd twop32-0b(%eax), %xmm1
OpenPOWER on IntegriCloud