diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2016-11-11 21:34:47 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2016-11-11 21:34:47 +0000 |
| commit | 088faab429538c6123024f6f173ee6e35845f445 (patch) | |
| tree | c9d7ad32adc8d4698b28c87687bb9e4951a342da /libclc | |
| parent | e477a0e5ec675ed3f15e746ef3f447faa2a1e419 (diff) | |
| download | bcm5719-llvm-088faab429538c6123024f6f173ee6e35845f445.tar.gz bcm5719-llvm-088faab429538c6123024f6f173ee6e35845f445.zip | |
Fix build since llvm r286566 and require at least llvm 4.0
llvm-svn: 286634
Diffstat (limited to 'libclc')
| -rwxr-xr-x | libclc/configure.py | 4 | ||||
| -rw-r--r-- | libclc/utils/prepare-builtins.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libclc/configure.py b/libclc/configure.py index 9626f0e7179..f26f5359a3e 100755 --- a/libclc/configure.py +++ b/libclc/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/libclc/utils/prepare-builtins.cpp b/libclc/utils/prepare-builtins.cpp index 887067294ea..9ca6e79a030 100644 --- a/libclc/utils/prepare-builtins.cpp +++ b/libclc/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" |
