diff --git a/cbackend.cpp b/cbackend.cpp index b433240e..f5fa85c7 100644 --- a/cbackend.cpp +++ b/cbackend.cpp @@ -71,7 +71,11 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FormattedStream.h" #include "llvm/Support/GetElementPtrTypeIterator.h" -#include "llvm/Support/InstVisitor.h" +#if defined(LLVM_3_3) + #include "llvm/InstVisitor.h" +#else + #include "llvm/Support/InstVisitor.h" +#endif #include "llvm/Support/MathExtras.h" #include "llvm/Support/TargetRegistry.h" #include "llvm/Support/Host.h" diff --git a/ispc.cpp b/ispc.cpp index e5a287e7..af066063 100644 --- a/ispc.cpp +++ b/ispc.cpp @@ -129,9 +129,9 @@ lGetSystemISA() { static const char *supportedCPUs[] = { "atom", "penryn", "core2", "corei7", "corei7-avx" -#ifdef LLVM_3_2 +#if defined(LLVM_3_2) || defined(LLVM_3_3) , "core-avx-i", "core-avx2" -#endif // LLVM_3_2 +#endif // LLVM_3_2 or LLVM_3_3 }; diff --git a/ispc.h b/ispc.h index 045916ab..40436d7c 100644 --- a/ispc.h +++ b/ispc.h @@ -40,8 +40,8 @@ #define ISPC_VERSION "1.3.1dev" -#if !defined(LLVM_3_0) && !defined(LLVM_3_1) && !defined(LLVM_3_2) -#error "Only LLVM 3.0, 3.1, and the 3.2 development branch are supported" +#if !defined(LLVM_3_0) && !defined(LLVM_3_1) && !defined(LLVM_3_2) && !defined(LLVM_3_3) +#error "Only LLVM 3.0, 3.1, 3.2, and the 3.3 development branch are supported" #endif #if defined(_WIN32) || defined(_WIN64) diff --git a/main.cpp b/main.cpp index 8076456f..70dfb5b6 100644 --- a/main.cpp +++ b/main.cpp @@ -68,6 +68,8 @@ lPrintVersion() { "3.1" #elif defined(LLVM_3_2) "3.2" +#elif defined(LLVM_3_3) + "3.3" #else #error "Unhandled LLVM version" #endif