bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

build llvm with systemz backend enabled, and link to related libraries

Browse source 
when building rust against system llvm

closes #36077
This commit is contained in:
Jorge Aparicio 2016-08-28 13:18:28 -05:00
parent b17fa8bf01
commit 15d8dfb6a0
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -1747,7 +1747,7 @@ do
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_ASSERTIONS=ON" CMAKE_ARGS="$CMAKE_ARGS -DLLVM_ENABLE_ASSERTIONS=ON"
fi fi
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64;Mips;PowerPC'" CMAKE_ARGS="$CMAKE_ARGS -DLLVM_TARGETS_TO_BUILD='X86;ARM;AArch64;Mips;PowerPC;SystemZ'"
CMAKE_ARGS="$CMAKE_ARGS -G '$CFG_CMAKE_GENERATOR'" CMAKE_ARGS="$CMAKE_ARGS -G '$CFG_CMAKE_GENERATOR'"
CMAKE_ARGS="$CMAKE_ARGS $CFG_LLVM_SRC_DIR" CMAKE_ARGS="$CMAKE_ARGS $CFG_LLVM_SRC_DIR"

2
mk/main.mk
View file

@ -300,7 +300,7 @@ endif
# LLVM macros # LLVM macros
###################################################################### ######################################################################
LLVM_OPTIONAL_COMPONENTS=x86 arm aarch64 mips powerpc pnacl LLVM_OPTIONAL_COMPONENTS=x86 arm aarch64 mips powerpc pnacl systemz
LLVM_REQUIRED_COMPONENTS=ipo bitreader bitwriter linker asmparser mcjit \ LLVM_REQUIRED_COMPONENTS=ipo bitreader bitwriter linker asmparser mcjit \
interpreter instrumentation interpreter instrumentation

9
src/rustllvm/PassWrapper.cpp
View file

@ -131,12 +131,19 @@ LLVMRustAddPass(LLVMPassManagerRef PM, LLVMPassRef rust_pass) {
#define SUBTARGET_PPC #define SUBTARGET_PPC
#endif #endif
#ifdef LLVM_COMPONENT_SYSTEMZ
#define SUBTARGET_SYSTEMZ SUBTARGET(SystemZ)
#else
#define SUBTARGET_SYSTEMZ
#endif
#define GEN_SUBTARGETS \ #define GEN_SUBTARGETS \
SUBTARGET_X86 \ SUBTARGET_X86 \
SUBTARGET_ARM \ SUBTARGET_ARM \
SUBTARGET_AARCH64 \ SUBTARGET_AARCH64 \
SUBTARGET_MIPS \ SUBTARGET_MIPS \
SUBTARGET_PPC SUBTARGET_PPC \
SUBTARGET_SYSTEMZ
#define SUBTARGET(x) namespace llvm { \ #define SUBTARGET(x) namespace llvm { \
extern const SubtargetFeatureKV x##FeatureKV[]; \ extern const SubtargetFeatureKV x##FeatureKV[]; \