Revert "Workaround for LLVM-3.2 invalid reporting of host triple on darwin9.8"
This reverts commit ea315a58cb.
This commit is contained in:
parent
ea315a58cb
commit
d0fd53fda3
1 changed files with 4 additions and 9 deletions
13
llvm/ee.py
13
llvm/ee.py
|
|
@ -214,10 +214,7 @@ class EngineBuilder(object):
|
||||||
_util.check_is_unowned(tm)
|
_util.check_is_unowned(tm)
|
||||||
ret = _core.LLVMEngineBuilderCreateTM(self.ptr, tm.ptr)
|
ret = _core.LLVMEngineBuilderCreateTM(self.ptr, tm.ptr)
|
||||||
else:
|
else:
|
||||||
# Fix wrong host-triple reported by LLVM 3.2 on darwin9.8
|
ret = _core.LLVMEngineBuilderCreate(self.ptr)
|
||||||
# ret = _core.LLVMEngineBuilderCreate(self.ptr)
|
|
||||||
tm = self.select_target()
|
|
||||||
ret = _core.LLVMEngineBuilderCreateTM(self.ptr, tm.ptr)
|
|
||||||
if isinstance(ret, str):
|
if isinstance(ret, str):
|
||||||
raise llvm.LLVMException(ret)
|
raise llvm.LLVMException(ret)
|
||||||
engine = ExecutionEngine(ret, self._module)
|
engine = ExecutionEngine(ret, self._module)
|
||||||
|
|
@ -227,11 +224,9 @@ class EngineBuilder(object):
|
||||||
|
|
||||||
def select_target(self):
|
def select_target(self):
|
||||||
'''get the corresponding target machine
|
'''get the corresponding target machine
|
||||||
'''
|
'''
|
||||||
# Fix wrong host-triple reported by LLVM 3.2 on darwin9.8
|
ptr = _core.LLVMTargetMachineFromEngineBuilder(self.ptr)
|
||||||
# ptr = _core.LLVMTargetMachineFromEngineBuilder(self.ptr)
|
return TargetMachine(ptr)
|
||||||
# return TargetMachine(ptr)
|
|
||||||
return TargetMachine.new(cm=CM_JITDEFAULT)
|
|
||||||
|
|
||||||
#===----------------------------------------------------------------------===
|
#===----------------------------------------------------------------------===
|
||||||
# Execution engine
|
# Execution engine
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue