diff options
author | Jeroen Ketema <j.ketema@imperial.ac.uk> | 2015-08-07 08:31:37 +0000 |
---|---|---|
committer | Jeroen Ketema <j.ketema@imperial.ac.uk> | 2015-08-07 08:31:37 +0000 |
commit | d915739b388f6322d5ccf75254da332e57f995af (patch) | |
tree | f9b757e68d7abe260623278bf33465a12582d339 /libclc/utils | |
parent | 8dbe1615021baa17f7010991beccb190cd32b851 (diff) | |
download | llvm-d915739b388f6322d5ccf75254da332e57f995af.zip llvm-d915739b388f6322d5ccf75254da332e57f995af.tar.gz llvm-d915739b388f6322d5ccf75254da332e57f995af.tar.bz2 |
Require LLVM >=3.7 and bump version to 0.2.0
v2: Also remove LLVM 3.6 traces from prepare-builtins.cpp
Patch by: EdB
llvm-svn: 244310
Diffstat (limited to 'libclc/utils')
-rw-r--r-- | libclc/utils/prepare-builtins.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/libclc/utils/prepare-builtins.cpp b/libclc/utils/prepare-builtins.cpp index e439ad1..a7b0db5 100644 --- a/libclc/utils/prepare-builtins.cpp +++ b/libclc/utils/prepare-builtins.cpp @@ -14,10 +14,6 @@ #include <system_error> -#define LLVM_360 \ - (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR == 6) - - using namespace llvm; static cl::opt<std::string> @@ -43,20 +39,12 @@ int main(int argc, char **argv) { if (std::error_code ec = BufferOrErr.getError()) ErrorMessage = ec.message(); else { -#if LLVM_360 - ErrorOr<Module *> -#else - ErrorOr<std::unique_ptr<Module>> -#endif - ModuleOrErr = + ErrorOr<std::unique_ptr<Module>> ModuleOrErr = parseBitcodeFile(BufferPtr.get()->getMemBufferRef(), Context); if (std::error_code ec = ModuleOrErr.getError()) ErrorMessage = ec.message(); -#if LLVM_360 - M = ModuleOrErr.get(); -#else + M = ModuleOrErr.get().release(); -#endif } } |