mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-31 12:41:49 +01:00
Introduce llvm::sys::getProcessTriple() function.
In r143502, we renamed getHostTriple() to getDefaultTargetTriple() as part of work to allow the user to supply a different default target triple at configure time. This change also affected the JIT. However, it is inappropriate to use the default target triple in the JIT in most circumstances because this will not necessarily match the current architecture used by the process, leading to illegal instruction and other such errors at run time. Introduce the getProcessTriple() function for use in the JIT and its clients, and cause the JIT to use it. On architectures with a single bitness, the host and process triples are identical. On other architectures, the host triple represents the architecture of the host CPU, while the process triple represents the architecture used by the host CPU to interpret machine code within the current process. For example, when executing 32-bit code on a 64-bit Linux machine, the host triple may be 'x86_64-unknown-linux-gnu', while the process triple may be 'i386-unknown-linux-gnu'. This fixes JIT for the 32-on-64-bit (and vice versa) build on non-Apple platforms. Differential Revision: http://llvm-reviews.chandlerc.com/D254 llvm-svn: 172627
This commit is contained in:
Peter Collingbourne
parent
d77376b63f
commit
5f190b5e4e
@ -134,6 +134,9 @@ BUILD_CXX=@BUILD_CXX@
|
||||
# Triple for configuring build tools when cross-compiling
|
||||
BUILD_TRIPLE=@build@
|
||||
|
||||
# Target triple (cpu-vendor-os) which LLVM is compiled for
|
||||
HOST_TRIPLE=@host@
|
||||
|
||||
# Target triple (cpu-vendor-os) for which we should generate code
|
||||
TARGET_TRIPLE=@target@
|
||||
|
||||
|
||||
@ -42,6 +42,10 @@ namespace sys {
|
||||
/// CPU_TYPE-VENDOR-KERNEL-OPERATING_SYSTEM
|
||||
std::string getDefaultTargetTriple();
|
||||
|
||||
/// getProcessTriple() - Return an appropriate target triple for generating
|
||||
/// code to be loaded into the current process, e.g. when using the JIT.
|
||||
std::string getProcessTriple();
|
||||
|
||||
/// getHostCPUName - Get the LLVM name for the host CPU. The particular format
|
||||
/// of the name is target dependent, and suitable for passing as -mcpu to the
|
||||
/// target which matches the host.
|
||||
|
||||
@ -32,18 +32,7 @@ TargetMachine *EngineBuilder::selectTarget() {
|
||||
// must use the host architecture.
|
||||
if (UseMCJIT && WhichEngine != EngineKind::Interpreter && M)
|
||||
TT.setTriple(M->getTargetTriple());
|
||||
else {
|
||||
TT.setTriple(LLVM_HOSTTRIPLE);
|
||||
#if defined(__APPLE__)
|
||||
#if defined(__LP64__)
|
||||
if (TT.isArch32Bit())
|
||||
TT = TT.get64BitArchVariant();
|
||||
#else
|
||||
if (TT.isArch64Bit())
|
||||
TT = TT.get32BitArchVariant();
|
||||
#endif
|
||||
#endif // APPLE
|
||||
}
|
||||
|
||||
return selectTarget(TT, MArch, MCPU, MAttrs);
|
||||
}
|
||||
|
||||
@ -55,7 +44,7 @@ TargetMachine *EngineBuilder::selectTarget(const Triple &TargetTriple,
|
||||
const SmallVectorImpl<std::string>& MAttrs) {
|
||||
Triple TheTriple(TargetTriple);
|
||||
if (TheTriple.getTriple().empty())
|
||||
TheTriple.setTriple(sys::getDefaultTargetTriple());
|
||||
TheTriple.setTriple(sys::getProcessTriple());
|
||||
|
||||
// Adjust the triple to match what the user requested.
|
||||
const Target *TheTarget = 0;
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
#include "llvm/ADT/SmallVector.h"
|
||||
#include "llvm/ADT/StringRef.h"
|
||||
#include "llvm/ADT/StringSwitch.h"
|
||||
#include "llvm/ADT/Triple.h"
|
||||
#include "llvm/Config/config.h"
|
||||
#include "llvm/Support/DataStream.h"
|
||||
#include "llvm/Support/Debug.h"
|
||||
@ -578,3 +579,14 @@ bool sys::getHostCPUFeatures(StringMap<bool> &Features){
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
std::string sys::getProcessTriple() {
|
||||
Triple PT(LLVM_HOSTTRIPLE);
|
||||
|
||||
if (sizeof(void *) == 8 && PT.isArch32Bit())
|
||||
PT = PT.get64BitArchVariant();
|
||||
if (sizeof(void *) == 4 && PT.isArch64Bit())
|
||||
PT = PT.get32BitArchVariant();
|
||||
|
||||
return PT.str();
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
@.LC0 = internal global [10 x i8] c"argc: %d\0A\00" ; <[10 x i8]*> [#uses=1]
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @foo(i32 %X, i32 %Y, double %A) {
|
||||
%cond212 = fcmp une double %A, 1.000000e+00 ; <i1> [#uses=1]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @main() {
|
||||
call i32 @mylog( i32 4 ) ; <i32>:1 [#uses=0]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @main() {
|
||||
; <label>:0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
; We were accidentally inverting the signedness of right shifts. Whoops.
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @main() {
|
||||
%X = fadd double 0.000000e+00, 1.000000e+00 ; <double> [#uses=1]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @bar(i8* %X) {
|
||||
; pointer should be 4 byte aligned!
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
; This testcase should return with an exit code of 1.
|
||||
;
|
||||
; RUN: not %lli -mtriple=%mcjit_triple -use-mcjit %s
|
||||
; RUN: not %lli_mcjit %s
|
||||
|
||||
@test = global i64 0 ; <i64*> [#uses=1]
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s test
|
||||
; RUN: %lli_mcjit %s test
|
||||
|
||||
declare i32 @puts(i8*)
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
target datalayout = "e-p:32:32"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
; Testcase distilled from 256.bzip2.
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
; Testcase distilled from 256.bzip2.
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
; This testcase failed to work because two variable sized allocas confused the
|
||||
; local register allocator.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
;
|
||||
; Regression Test: EnvironmentTest.ll
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
; This testcase exposes a bug in the local register allocator where it runs out
|
||||
; of registers (due to too many overlapping live ranges), but then attempts to
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
@A = global i32 0 ; <i32*> [#uses=1]
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
; PR672
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s
|
||||
; RUN: %lli_mcjit %s
|
||||
; XFAIL: mcjit-ia32
|
||||
|
||||
define i32 @main() {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -force-interpreter %s
|
||||
; RUN: %lli_mcjit -force-interpreter %s
|
||||
; PR1836
|
||||
|
||||
define i32 @main() {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -force-interpreter=true %s | grep 1
|
||||
; RUN: %lli_mcjit -force-interpreter=true %s | grep 1
|
||||
|
||||
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
|
||||
target triple = "i686-pc-linux-gnu"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -force-interpreter=true %s > /dev/null
|
||||
; RUN: %lli_mcjit -force-interpreter=true %s > /dev/null
|
||||
|
||||
define i32 @main() {
|
||||
%a = add i32 0, undef
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -force-interpreter=true %s | grep 40091eb8
|
||||
; RUN: %lli_mcjit -force-interpreter=true %s | grep 40091eb8
|
||||
;
|
||||
define i32 @test(double %x) {
|
||||
entry:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
@.LC0 = internal global [12 x i8] c"Hello World\00" ; <[12 x i8]*> [#uses=1]
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
@X = global i32 7 ; <i32*> [#uses=0]
|
||||
@msg = internal global [13 x i8] c"Hello World\0A\00" ; <[13 x i8]*> [#uses=1]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -O0 -disable-lazy-compilation=false %s
|
||||
; RUN: %lli_mcjit -O0 -disable-lazy-compilation=false %s
|
||||
|
||||
; The intention of this test is to verify that symbols mapped to COMMON in ELF
|
||||
; work as expected.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @main() {
|
||||
ret i32 0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit -remote-mcjit %s > /dev/null
|
||||
; XFAIL: arm, mips
|
||||
|
||||
define i32 @bar() {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @bar() {
|
||||
ret i32 0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit -disable-lazy-compilation=false %s
|
||||
; RUN: %lli_mcjit -remote-mcjit -disable-lazy-compilation=false %s
|
||||
; XFAIL: arm, mips
|
||||
|
||||
define i32 @main() nounwind {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -disable-lazy-compilation=false %s
|
||||
; RUN: %lli_mcjit -disable-lazy-compilation=false %s
|
||||
|
||||
define i32 @main() nounwind {
|
||||
entry:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @main() {
|
||||
%A = add i8 0, 12 ; <i8> [#uses=1]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
; test unconditional branch
|
||||
define i32 @main() {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @_Z14func_exit_codev() nounwind uwtable {
|
||||
entry:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
declare void @exit(i32)
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @foo() {
|
||||
ret i32 0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -O0 %s
|
||||
; RUN: %lli_mcjit -O0 %s
|
||||
|
||||
; This test checks that common symbols have been allocated addresses honouring
|
||||
; the alignment requirement.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit -O0 -disable-lazy-compilation=false %s
|
||||
; RUN: %lli_mcjit -remote-mcjit -O0 -disable-lazy-compilation=false %s
|
||||
; XFAIL: arm, mips
|
||||
|
||||
; The intention of this test is to verify that symbols mapped to COMMON in ELF
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -O0 -disable-lazy-compilation=false %s
|
||||
; RUN: %lli_mcjit -O0 -disable-lazy-compilation=false %s
|
||||
|
||||
; The intention of this test is to verify that symbols mapped to COMMON in ELF
|
||||
; work as expected.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
; This tests to make sure that we can evaluate weird constant expressions
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit -O0 %s
|
||||
; RUN: %lli_mcjit -remote-mcjit -O0 %s
|
||||
; XFAIL: arm, mips
|
||||
|
||||
; Check that a variable is always aligned as specified.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -O0 %s
|
||||
; RUN: %lli_mcjit -O0 %s
|
||||
|
||||
; Check that a variable is always aligned as specified.
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit -remote-mcjit %s > /dev/null
|
||||
; XFAIL: arm, mips
|
||||
|
||||
define double @test(double* %DP, double %Arg) {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define double @test(double* %DP, double %Arg) {
|
||||
%D = load double* %DP ; <double> [#uses=1]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define double @test(double* %DP, double %Arg) {
|
||||
%D = load double* %DP ; <double> [#uses=1]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
@var = global i32 1, align 4
|
||||
@llvm.global_ctors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* @ctor_func }]
|
||||
@llvm.global_dtors = appending global [1 x { i32, void ()* }] [{ i32, void ()* } { i32 65535, void ()* @dtor_func }]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit -remote-mcjit %s > /dev/null
|
||||
; XFAIL: arm, mips
|
||||
|
||||
@count = global i32 1, align 4
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
@count = global i32 1, align 4
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
@count = global i32 0, align 4
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define void @test(i8* %P, i16* %P.upgrd.1, i32* %P.upgrd.2, i64* %P.upgrd.3) {
|
||||
%V = load i8* %P ; <i8> [#uses=1]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @main() nounwind uwtable {
|
||||
entry:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @main() {
|
||||
%A = and i8 4, 8 ; <i8> [#uses=2]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @main() {
|
||||
; <label>:0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
; test phi node
|
||||
@Y = global i32 6 ; <i32*> [#uses=1]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -remote-mcjit -O0 %s
|
||||
; RUN: %lli_mcjit -remote-mcjit -O0 %s
|
||||
; XFAIL: arm, mips
|
||||
|
||||
@.str = private unnamed_addr constant [6 x i8] c"data1\00", align 1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit -O0 %s
|
||||
; RUN: %lli_mcjit -O0 %s
|
||||
|
||||
@.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
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
; test return instructions
|
||||
define void @test1() {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @main() nounwind uwtable {
|
||||
entry:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
|
||||
define i32 @main() {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @main() {
|
||||
%int1 = add i32 0, 0 ; <i32> [#uses=6]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
; RUN: %lli -mtriple=%mcjit_triple -use-mcjit %s > /dev/null
|
||||
; RUN: %lli_mcjit %s > /dev/null
|
||||
|
||||
define i32 @main() {
|
||||
%shamt = add i8 0, 1 ; <i8> [#uses=8]
|
||||
|
||||
@ -131,7 +131,8 @@ endif
|
||||
|
||||
lit.site.cfg: FORCE
|
||||
@echo "Making LLVM 'lit.site.cfg' file..."
|
||||
@$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g > lit.tmp
|
||||
@$(ECHOPATH) s=@LLVM_HOSTTRIPLE@=$(HOST_TRIPLE)=g > lit.tmp
|
||||
@$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> lit.tmp
|
||||
@$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g >> lit.tmp
|
||||
@$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp
|
||||
@$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp
|
||||
|
||||
16
test/lit.cfg
16
test/lit.cfg
@ -140,12 +140,16 @@ if config.test_exec_root is None:
|
||||
|
||||
###
|
||||
|
||||
# Provide a target triple for mcjit tests
|
||||
mcjit_triple = config.target_triple
|
||||
# Force ELF format on Windows
|
||||
if re.search(r'cygwin|mingw32|win32', mcjit_triple):
|
||||
mcjit_triple += "-elf"
|
||||
config.substitutions.append( ('%mcjit_triple', mcjit_triple) )
|
||||
# Provide a command line for mcjit tests
|
||||
lli_mcjit = 'lli -use-mcjit'
|
||||
# The target triple used by default by lli is the process target triple (some
|
||||
# triple appropriate for generating code for the current process) but because
|
||||
# we don't support COFF in MCJIT well enough for the tests, force ELF format on
|
||||
# Windows. FIXME: the process target triple should be used here, but this is
|
||||
# difficult to obtain on Windows.
|
||||
if re.search(r'cygwin|mingw32|win32', config.host_triple):
|
||||
lli_mcjit += ' -mtriple='+config.host_triple+'-elf'
|
||||
config.substitutions.append( ('%lli_mcjit', lli_mcjit) )
|
||||
|
||||
# Provide a substition for those tests that need to run the jit to obtain data
|
||||
# but simply want use the currently considered most reliable jit for platform
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
## Autogenerated by LLVM/Clang configuration.
|
||||
# Do not edit!
|
||||
config.host_triple = "@LLVM_HOSTTRIPLE@"
|
||||
config.target_triple = "@TARGET_TRIPLE@"
|
||||
config.llvm_src_root = "@LLVM_SOURCE_DIR@"
|
||||
config.llvm_obj_root = "@LLVM_BINARY_DIR@"
|
||||
|
||||
@ -137,7 +137,7 @@ protected:
|
||||
// Override the triple to generate ELF on Windows since that's supported
|
||||
Triple Tuple(TheModule->getTargetTriple());
|
||||
if (Tuple.getTriple().empty())
|
||||
Tuple.setTriple(LLVM_HOSTTRIPLE);
|
||||
Tuple.setTriple(sys::getProcessTriple());
|
||||
|
||||
if (Tuple.isOSWindows() && Triple::ELF != Tuple.getEnvironment()) {
|
||||
Tuple.setEnvironment(Triple::ELF);
|
||||
|
||||
@ -52,7 +52,7 @@ protected:
|
||||
, MArch("")
|
||||
, Builder(Context)
|
||||
, MM(new SectionMemoryManager)
|
||||
, HostTriple(LLVM_HOSTTRIPLE)
|
||||
, HostTriple(sys::getProcessTriple())
|
||||
{
|
||||
InitializeNativeTarget();
|
||||
InitializeNativeTargetAsmPrinter();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user