summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2016-11-11 21:34:47 +0000
committerTom Stellard <thomas.stellard@amd.com>2016-11-11 21:34:47 +0000
commit3056290b81e83e9f0cc13fe87f754ad2ad0a003b (patch)
tree0eda22c51ed5fa09ca889bd62ab3d68f123726f3
parent520743b0b72862a987ead6213dc1a5321a2010f9 (diff)
Fix build since llvm r286566 and require at least llvm 4.0
git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@286634 91177308-0d34-0410-b5e6-96231b3b80d8
-rwxr-xr-xconfigure.py4
-rw-r--r--utils/prepare-builtins.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.py b/configure.py
index 9626f0e..f26f535 100755
--- a/configure.py
+++ b/configure.py
@@ -69,8 +69,8 @@ llvm_version = string.split(string.replace(llvm_config(['--version']), 'svn', ''
llvm_int_version = int(llvm_version[0]) * 100 + int(llvm_version[1]) * 10
llvm_string_version = 'LLVM' + llvm_version[0] + '.' + llvm_version[1]
-if llvm_int_version < 390:
- print "libclc requires LLVM >= 3.9"
+if llvm_int_version < 400:
+ print "libclc requires LLVM >= 4.0"
sys.exit(1)
llvm_system_libs = llvm_config(['--system-libs'])
diff --git a/utils/prepare-builtins.cpp b/utils/prepare-builtins.cpp
index 8870672..9ca6e79 100644
--- a/utils/prepare-builtins.cpp
+++ b/utils/prepare-builtins.cpp
@@ -1,4 +1,5 @@
-#include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/Bitcode/BitcodeReader.h"
+#include "llvm/Bitcode/BitcodeWriter.h"
#include "llvm/IR/Function.h"
#include "llvm/IR/GlobalVariable.h"
#include "llvm/IR/LLVMContext.h"