From de8880a23d52c60fb6669d4064cefc8c00f8f35d Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Wed, 21 Aug 2013 02:37:25 +0000 Subject: X86TargetMachine.cpp: Clarify to emit GOT in i686-{cygming|win32}-elf for mcjit. I suppose all "lli -use-mcjit i686-*" should require GOT, (and to fail.) llvm-svn: 188856 --- llvm/lib/Target/X86/X86TargetMachine.cpp | 2 +- .../ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll | 2 +- llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll | 2 +- llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll | 2 +- llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'llvm') diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp index 49ebd1ae31d..81423a3ef4b 100644 --- a/llvm/lib/Target/X86/X86TargetMachine.cpp +++ b/llvm/lib/Target/X86/X86TargetMachine.cpp @@ -92,7 +92,7 @@ X86TargetMachine::X86TargetMachine(const Target &T, StringRef TT, } else if (Subtarget.is64Bit()) { // PIC in 64 bit mode is always rip-rel. Subtarget.setPICStyle(PICStyles::RIPRel); - } else if (Subtarget.isTargetCygMing()) { + } else if (Subtarget.isTargetCOFF()) { Subtarget.setPICStyle(PICStyles::None); } else if (Subtarget.isTargetDarwin()) { if (getRelocationModel() == Reloc::PIC_) diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll index 240e09510e3..819a199ad85 100644 --- a/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll +++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli_mcjit -remote-mcjit -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips, aarch64, arm, i686-pc-linux +; XFAIL: mips, aarch64, arm, i686 @count = global i32 1, align 4 diff --git a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll index c5e87edb5b1..e13179c6eb6 100644 --- a/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll +++ b/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli_mcjit -remote-mcjit -O0 -relocation-model=pic -code-model=small %s -; XFAIL: mips, aarch64, arm, i686-pc-linux +; XFAIL: mips, aarch64, arm, i686 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 @ptr = global i8* getelementptr inbounds ([6 x i8]* @.str, i32 0, i32 0), align 4 diff --git a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll index abca78746bd..bba7572243f 100644 --- a/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll +++ b/llvm/test/ExecutionEngine/MCJIT/test-global-init-nonzero-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli_mcjit -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: mips, aarch64, arm, i686-pc-linux +; XFAIL: mips, aarch64, arm, i686 @count = global i32 1, align 4 diff --git a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll index 948bac0f57f..cea00a0e391 100644 --- a/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll +++ b/llvm/test/ExecutionEngine/MCJIT/test-ptr-reloc-sm-pic.ll @@ -1,5 +1,5 @@ ; RUN: %lli_mcjit -O0 -relocation-model=pic -code-model=small %s -; XFAIL: mips, aarch64, arm, i686-pc-linux +; XFAIL: mips, aarch64, arm, i686 @.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1 @ptr = global i8* getelementptr inbounds ([6 x i8]* @.str, i32 0, i32 0), align 4 -- cgit v1.2.3