diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp | 11 | ||||
| -rw-r--r-- | llvm/test/MC/MachO/bad-darwin-x86_64-reloc-expr1.s | 6 | ||||
| -rw-r--r-- | llvm/test/MC/MachO/bad-darwin-x86_64-reloc-expr2.s | 6 |
3 files changed, 19 insertions, 4 deletions
diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp index adf3fd8e491..5685a7fde14 100644 --- a/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp +++ b/llvm/lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp @@ -179,11 +179,14 @@ void X86MachObjectWriter::RecordX86_64Relocation(MachObjectWriter *Writer, if (A_Base == B_Base && A_Base) report_fatal_error("unsupported relocation with identical base", false); - // A subtraction expression where both symbols are undefined is a + // A subtraction expression where either symbol is undefined is a // non-relocatable expression. - if (A->isUndefined() && B->isUndefined()) - report_fatal_error("unsupported relocation with subtraction expression", - false); + if (A->isUndefined() || B->isUndefined()) { + StringRef Name = A->isUndefined() ? A->getName() : B->getName(); + Asm.getContext().FatalError(Fixup.getLoc(), + "unsupported relocation with subtraction expression, symbol '" + + Name + "' can not be undefined in a subtraction expression"); + } Value += Writer->getSymbolAddress(&A_SD, Layout) - (!A_Base ? 0 : Writer->getSymbolAddress(A_Base, Layout)); diff --git a/llvm/test/MC/MachO/bad-darwin-x86_64-reloc-expr1.s b/llvm/test/MC/MachO/bad-darwin-x86_64-reloc-expr1.s new file mode 100644 index 00000000000..518ae6423db --- /dev/null +++ b/llvm/test/MC/MachO/bad-darwin-x86_64-reloc-expr1.s @@ -0,0 +1,6 @@ +// RUN: not llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - 2> %t.err > %t +// RUN: FileCheck --check-prefix=CHECK-ERROR < %t.err %s + +_Z: +.long (_Z+4)-_b +// CHECK-ERROR: error: unsupported relocation with subtraction expression, symbol '_b' can not be undefined in a subtraction expression diff --git a/llvm/test/MC/MachO/bad-darwin-x86_64-reloc-expr2.s b/llvm/test/MC/MachO/bad-darwin-x86_64-reloc-expr2.s new file mode 100644 index 00000000000..3aefd87c557 --- /dev/null +++ b/llvm/test/MC/MachO/bad-darwin-x86_64-reloc-expr2.s @@ -0,0 +1,6 @@ +// RUN: not llvm-mc -triple x86_64-apple-darwin10 %s -filetype=obj -o - 2> %t.err > %t +// RUN: FileCheck --check-prefix=CHECK-ERROR < %t.err %s + +_Z: +.long (_a+4)-_Z +// CHECK-ERROR: error: unsupported relocation with subtraction expression, symbol '_a' can not be undefined in a subtraction expression |
