Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-04-02 13:12:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Require LLVM >=3.7 and bump version to 0.2.0

Browse Source 
v2: Also remove LLVM 3.6 traces from prepare-builtins.cpp

Patch by: EdB

llvm-svn: 244310
This commit is contained in:
Jeroen Ketema 2015-08-07 08:31:37 +00:00
parent 8dbe161502
commit d915739b38
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libclc/configure.py
View File

@ -5,7 +5,7 @@ def c_compiler_rule(b, name, description, compiler, flags):
b.rule(name, command, description + " $out", depfile="$out.d") b.rule(name, command, description + " $out", depfile="$out.d")
version_major = 0; version_major = 0;
version_minor = 1; version_minor = 2;
version_patch = 0; version_patch = 0;
from optparse import OptionParser from optparse import OptionParser
@ -66,12 +66,13 @@ def llvm_config(args):
sys.exit(1) sys.exit(1)
llvm_version = string.split(string.replace(llvm_config(['--version']), 'svn', ''), '.') llvm_version = string.split(string.replace(llvm_config(['--version']), 'svn', ''), '.')
if (int(llvm_version[0]) != 3 and int(llvm_version[1]) != 6): llvm_int_version = int(llvm_version[0]) * 100 + int(llvm_version[1]) * 10
print "libclc requires LLVM 3.6"
sys.exit(1)
llvm_string_version = 'LLVM' + llvm_version[0] + '.' + llvm_version[1] llvm_string_version = 'LLVM' + llvm_version[0] + '.' + llvm_version[1]
if llvm_int_version < 370:
print "libclc requires LLVM >= 3.7"
sys.exit(1)
llvm_system_libs = llvm_config(['--system-libs']) llvm_system_libs = llvm_config(['--system-libs'])
llvm_bindir = llvm_config(['--bindir']) llvm_bindir = llvm_config(['--bindir'])
llvm_core_libs = llvm_config(['--libs', 'core', 'bitreader', 'bitwriter']) + ' ' + \ llvm_core_libs = llvm_config(['--libs', 'core', 'bitreader', 'bitwriter']) + ' ' + \

16
libclc/utils/prepare-builtins.cpp
View File

@ -14,10 +14,6 @@
#include <system_error> #include <system_error>
#define LLVM_360 \
(LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR == 6)
using namespace llvm; using namespace llvm;
static cl::opt<std::string> static cl::opt<std::string>
@ -43,20 +39,12 @@ int main(int argc, char **argv) {
if (std::error_code ec = BufferOrErr.getError()) if (std::error_code ec = BufferOrErr.getError())
ErrorMessage = ec.message(); ErrorMessage = ec.message();
else { else {
#if LLVM_360 ErrorOr<std::unique_ptr<Module>> ModuleOrErr =
ErrorOr<Module *>
#else
ErrorOr<std::unique_ptr<Module>>
#endif
ModuleOrErr =
parseBitcodeFile(BufferPtr.get()->getMemBufferRef(), Context); parseBitcodeFile(BufferPtr.get()->getMemBufferRef(), Context);
if (std::error_code ec = ModuleOrErr.getError()) if (std::error_code ec = ModuleOrErr.getError())
ErrorMessage = ec.message(); ErrorMessage = ec.message();
#if LLVM_360
M = ModuleOrErr.get();
#else
M = ModuleOrErr.get().release(); M = ModuleOrErr.get().release();
#endif
} }
} }