From e54a0d981992896d86ac6d25513448a2dcc870ec Mon Sep 17 00:00:00 2001 From: Yang Rong Date: Wed, 12 Feb 2014 23:41:26 +0800 Subject: [PATCH] Fix build errors in llvm3.5 only system. There are some head files miss if have llvm3.5 only. If has previous llvm, even uninstall, will still remain these head files in system, so can't trigger it. Signed-off-by: Yang Rong Reviewed-by: Zhigang Gong --- backend/src/llvm/llvm_gen_backend.cpp | 6 ++++++ backend/src/llvm/llvm_passes.cpp | 6 ++++++ backend/src/llvm/llvm_to_gen.cpp | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/backend/src/llvm/llvm_gen_backend.cpp b/backend/src/llvm/llvm_gen_backend.cpp index a9c08bf..2d4fb0a 100644 --- a/backend/src/llvm/llvm_gen_backend.cpp +++ b/backend/src/llvm/llvm_gen_backend.cpp @@ -105,7 +105,13 @@ #include "llvm/Analysis/ValueTracking.h" #include "llvm/CodeGen/Passes.h" #include "llvm/CodeGen/IntrinsicLowering.h" + +#if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >=5 +#include "llvm/IR/Mangler.h" +#else #include "llvm/Target/Mangler.h" +#endif + #include "llvm/Transforms/Scalar.h" #include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCContext.h" diff --git a/backend/src/llvm/llvm_passes.cpp b/backend/src/llvm/llvm_passes.cpp index 1091dae..d30a570 100644 --- a/backend/src/llvm/llvm_passes.cpp +++ b/backend/src/llvm/llvm_passes.cpp @@ -64,7 +64,13 @@ #include "llvm/Analysis/ValueTracking.h" #include "llvm/CodeGen/Passes.h" #include "llvm/CodeGen/IntrinsicLowering.h" + +#if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >=5 +#include "llvm/IR/Mangler.h" +#else #include "llvm/Target/Mangler.h" +#endif + #include "llvm/Transforms/Scalar.h" #include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCContext.h" diff --git a/backend/src/llvm/llvm_to_gen.cpp b/backend/src/llvm/llvm_to_gen.cpp index 62d6f13..8b2ac04 100644 --- a/backend/src/llvm/llvm_to_gen.cpp +++ b/backend/src/llvm/llvm_to_gen.cpp @@ -34,7 +34,6 @@ #endif /* LLVM_VERSION_MINOR <= 2 */ #include "llvm/PassManager.h" #include "llvm/Pass.h" -#include "llvm/Analysis/Verifier.h" #include "llvm/Analysis/Passes.h" #include "llvm/Transforms/IPO.h" #include "llvm/Target/TargetLibraryInfo.h" @@ -47,11 +46,13 @@ #endif /* LLVM_VERSION_MINOR <= 2 */ #include "llvm/Support/raw_ostream.h" #include "llvm/Transforms/Scalar.h" -#include "llvm/Assembly/PrintModulePass.h" #if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >=5 #include "llvm/IR/IRPrintingPasses.h" #include "llvm/IR/Verifier.h" +#else +#include "llvm/Analysis/Verifier.h" +#include "llvm/Assembly/PrintModulePass.h" #endif #include "llvm/llvm_gen_backend.hpp" -- 2.7.4