From d0fd53fda33030c15ff4a6c4e596f1ab7938ac79 Mon Sep 17 00:00:00 2001 From: Siu Kwan Lam Date: Thu, 17 Jan 2013 14:22:27 -0600 Subject: [PATCH] Revert "Workaround for LLVM-3.2 invalid reporting of host triple on darwin9.8" This reverts commit ea315a58cbd24ca376dac11db2c94175c0d174c8. --- llvm/ee.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/llvm/ee.py b/llvm/ee.py index 2b9571f..15ede87 100644 --- a/llvm/ee.py +++ b/llvm/ee.py @@ -214,10 +214,7 @@ class EngineBuilder(object): _util.check_is_unowned(tm) ret = _core.LLVMEngineBuilderCreateTM(self.ptr, tm.ptr) else: - # Fix wrong host-triple reported by LLVM 3.2 on darwin9.8 - # ret = _core.LLVMEngineBuilderCreate(self.ptr) - tm = self.select_target() - ret = _core.LLVMEngineBuilderCreateTM(self.ptr, tm.ptr) + ret = _core.LLVMEngineBuilderCreate(self.ptr) if isinstance(ret, str): raise llvm.LLVMException(ret) engine = ExecutionEngine(ret, self._module) @@ -227,11 +224,9 @@ class EngineBuilder(object): def select_target(self): '''get the corresponding target machine - ''' - # Fix wrong host-triple reported by LLVM 3.2 on darwin9.8 - # ptr = _core.LLVMTargetMachineFromEngineBuilder(self.ptr) - # return TargetMachine(ptr) - return TargetMachine.new(cm=CM_JITDEFAULT) + ''' + ptr = _core.LLVMTargetMachineFromEngineBuilder(self.ptr) + return TargetMachine(ptr) #===----------------------------------------------------------------------=== # Execution engine