diff options
| author | kyeongwoon <kyeongwoon.lee@samsung.com> | 2012-11-30 09:21:49 +0900 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-01-13 16:43:39 -0800 |
| commit | 987f824f233faee4aed39dac92a1b442d42965cc (patch) | |
| tree | 2cf1b078738e9bf580b9ee43f674d95c403751fa /src/rustllvm | |
| parent | 27e6a0fa5651dbda55773488c8b706adfa5cefc2 (diff) | |
| download | rust-987f824f233faee4aed39dac92a1b442d42965cc.tar.gz rust-987f824f233faee4aed39dac92a1b442d42965cc.zip | |
Support ARM and Android
Conflicts: src/libcore/os.rs src/librustc/back/link.rs src/librustc/driver/driver.rs src/librustc/metadata/loader.rs src/librustc/middle/trans/base.rs
Diffstat (limited to 'src/rustllvm')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 12 | ||||
| -rw-r--r-- | src/rustllvm/rustllvm.def.in | 14 |
2 files changed, 19 insertions, 7 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index b01294062a6..3c38f3c6215 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -91,6 +91,12 @@ void LLVMInitializeX86TargetMC(); void LLVMInitializeX86AsmPrinter(); void LLVMInitializeX86AsmParser(); + +void LLVMInitializeARMTargetInfo(); +void LLVMInitializeARMTarget(); +void LLVMInitializeARMTargetMC(); +void LLVMInitializeARMAsmPrinter(); +void LLVMInitializeARMAsmParser(); // Only initialize the platforms supported by Rust here, // because using --llvm-root will have multiple platforms // that rustllvm doesn't actually link to and it's pointless to put target info @@ -102,6 +108,12 @@ void LLVMRustInitializeTargets() { LLVMInitializeX86TargetMC(); LLVMInitializeX86AsmPrinter(); LLVMInitializeX86AsmParser(); + + LLVMInitializeARMTargetInfo(); + LLVMInitializeARMTarget(); + LLVMInitializeARMTargetMC(); + LLVMInitializeARMAsmPrinter(); + LLVMInitializeARMAsmParser(); } // Custom memory manager for MCJITting. It needs special features diff --git a/src/rustllvm/rustllvm.def.in b/src/rustllvm/rustllvm.def.in index 44636f4f36b..d3cbc490ada 100644 --- a/src/rustllvm/rustllvm.def.in +++ b/src/rustllvm/rustllvm.def.in @@ -383,19 +383,19 @@ LLVMInitializeInstCombine LLVMInitializeScalarOpts LLVMInitializeTarget LLVMInitializeTransformUtils +LLVMInitializeARMAsmLexer LLVMInitializeX86AsmLexer -LLVMInitializeX86AsmLexer -LLVMInitializeX86AsmParser +LLVMInitializeARMAsmParser LLVMInitializeX86AsmParser +LLVMInitializeARMAsmPrinter LLVMInitializeX86AsmPrinter -LLVMInitializeX86AsmPrinter -LLVMInitializeX86Disassembler +LLVMInitializeARMDisassembler LLVMInitializeX86Disassembler +LLVMInitializeARMTarget LLVMInitializeX86Target -LLVMInitializeX86Target -LLVMInitializeX86TargetMC +LLVMInitializeARMTargetMC LLVMInitializeX86TargetMC -LLVMInitializeX86TargetInfo +LLVMInitializeARMTargetInfo LLVMInitializeX86TargetInfo LLVMInsertBasicBlock LLVMInsertBasicBlockInContext |