aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support LLVM trunk after r204934 and zlib commits

Browse Source
This commit is contained in:
Ilia Filippov
2014-04-01 18:48:47 +04:00
parent cc8bae2f2c
commit 114f58bb0b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -53,7 +53,7 @@ will do all the work for you. Do the following: \n
2. Set ISPC_HOME variable to your ISPC location (probably current folder). 2. Set ISPC_HOME variable to your ISPC location (probably current folder).
3. Run alloy.py tool to checkout and build LLVM: \n 3. Run alloy.py tool to checkout and build LLVM: \n
alloy.py -b --version=3.4 \n alloy.py -b --version=3.4 \n
4. Add $LLVM_HOME/bin-3.4/bin path to your PATH. \n 4. Add $$LLVM_HOME/bin-3.4/bin path to your PATH. \n
============================================================================== ==============================================================================
endef endef
@@ -114,7 +114,7 @@ ifeq ($(LLVM_VERSION),LLVM_3_4)
endif endif
ifeq ($(LLVM_VERSION),LLVM_3_5) ifeq ($(LLVM_VERSION),LLVM_3_5)
ISPC_LIBS += -lcurses ISPC_LIBS += -lcurses -lz
endif endif
ifeq ($(ARCH_OS),Linux) ifeq ($(ARCH_OS),Linux)

4
cbackend.cpp
View File

@@ -1769,7 +1769,11 @@ std::string CWriter::GetValueName(const llvm::Value *Operand) {
// Resolve potential alias. // Resolve potential alias.
if (const llvm::GlobalAlias *GA = llvm::dyn_cast<llvm::GlobalAlias>(Operand)) { if (const llvm::GlobalAlias *GA = llvm::dyn_cast<llvm::GlobalAlias>(Operand)) {
#if defined(LLVM_3_5)
if (const llvm::Value *V = GA->getAliasedGlobal())
#else
if (const llvm::Value *V = GA->resolveAliasedGlobal(false)) if (const llvm::Value *V = GA->resolveAliasedGlobal(false))
#endif
Operand = V; Operand = V;
} }