diff options
| author | bors <bors@rust-lang.org> | 2017-04-27 00:04:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-27 00:04:03 +0000 |
| commit | 6e0c5af9de7727074af21735bdc9197cb9f1ff49 (patch) | |
| tree | f39ddb2fed9b6f0aff0dd3c25f7a1355c64abb2f /src/rustllvm/PassWrapper.cpp | |
| parent | 612847bf7171403022f8b4f1df1b87e377dcf01c (diff) | |
| parent | 60837b1e8db91eb0f46c50ff303f20f4f7f283e2 (diff) | |
| download | rust-6e0c5af9de7727074af21735bdc9197cb9f1ff49.tar.gz rust-6e0c5af9de7727074af21735bdc9197cb9f1ff49.zip | |
Auto merge of #41567 - arielb1:rollup, r=arielb1
Rollup of 9 pull requests - Successful merges: #41370, #41456, #41493, #41499, #41501, #41524, #41546, #41550, #41552 - Failed merges:
Diffstat (limited to 'src/rustllvm/PassWrapper.cpp')
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index c410a6b1349..b938f94cda2 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -147,6 +147,12 @@ extern "C" void LLVMRustAddPass(LLVMPassManagerRef PMR, LLVMPassRef RustPass) { #define SUBTARGET_SPARC #endif +#ifdef LLVM_COMPONENT_HEXAGON +#define SUBTARGET_HEXAGON SUBTARGET(Hexagon) +#else +#define SUBTARGET_HEXAGON +#endif + #define GEN_SUBTARGETS \ SUBTARGET_X86 \ SUBTARGET_ARM \ @@ -155,7 +161,8 @@ extern "C" void LLVMRustAddPass(LLVMPassManagerRef PMR, LLVMPassRef RustPass) { SUBTARGET_PPC \ SUBTARGET_SYSTEMZ \ SUBTARGET_MSP430 \ - SUBTARGET_SPARC + SUBTARGET_SPARC \ + SUBTARGET_HEXAGON #define SUBTARGET(x) \ namespace llvm { \ |