From fc7674191d1d07f078f1f25c91dc7941ff3a9cec Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Tue, 12 Aug 2008 15:54:27 +0200 Subject: Update Xcode project. --- Toilet Lisp.xcodeproj/project.pbxproj | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Toilet Lisp.xcodeproj/project.pbxproj b/Toilet Lisp.xcodeproj/project.pbxproj index f7664df..aa19886 100644 --- a/Toilet Lisp.xcodeproj/project.pbxproj +++ b/Toilet Lisp.xcodeproj/project.pbxproj @@ -7,13 +7,13 @@ objects = { /* Begin PBXBuildFile section */ + A72E9E380E51CB0500BDE40F /* MLKCompiledClosure.h in Headers */ = {isa = PBXBuildFile; fileRef = A72E9E370E51CB0500BDE40F /* MLKCompiledClosure.h */; }; + A72E9E3A0E51CB1300BDE40F /* MLKCompiledClosure.m in Sources */ = {isa = PBXBuildFile; fileRef = A72E9E390E51CB1300BDE40F /* MLKCompiledClosure.m */; }; A78711320E4C459200A7191F /* globals.m in Sources */ = {isa = PBXBuildFile; fileRef = A787112E0E4C459200A7191F /* globals.m */; }; A78711330E4C459200A7191F /* MLKArray.m in Sources */ = {isa = PBXBuildFile; fileRef = A787112F0E4C459200A7191F /* MLKArray.m */; }; - A78711340E4C459200A7191F /* MLKCompiledProcedure.m in Sources */ = {isa = PBXBuildFile; fileRef = A78711300E4C459200A7191F /* MLKCompiledProcedure.m */; }; A78711350E4C459200A7191F /* MLKForeignProcedure.m in Sources */ = {isa = PBXBuildFile; fileRef = A78711310E4C459200A7191F /* MLKForeignProcedure.m */; }; A787113A0E4C45A300A7191F /* globals.h in Headers */ = {isa = PBXBuildFile; fileRef = A78711360E4C45A300A7191F /* globals.h */; }; A787113B0E4C45A300A7191F /* MLKArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A78711370E4C45A300A7191F /* MLKArray.h */; }; - A787113C0E4C45A300A7191F /* MLKCompiledProcedure.h in Headers */ = {isa = PBXBuildFile; fileRef = A78711380E4C45A300A7191F /* MLKCompiledProcedure.h */; }; A787113D0E4C45A300A7191F /* MLKForeignProcedure.h in Headers */ = {isa = PBXBuildFile; fileRef = A78711390E4C45A300A7191F /* MLKForeignProcedure.h */; }; A78712010E4C4AC500A7191F /* array.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A787112C0E4C456C00A7191F /* array.lisp */; }; A78712020E4C4AC500A7191F /* control-flow.lisp in CopyFiles */ = {isa = PBXBuildFile; fileRef = A7A834010E477B76005D64E0 /* control-flow.lisp */; }; @@ -306,19 +306,19 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + A72E9E370E51CB0500BDE40F /* MLKCompiledClosure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKCompiledClosure.h; sourceTree = ""; }; + A72E9E390E51CB1300BDE40F /* MLKCompiledClosure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKCompiledClosure.m; sourceTree = ""; }; A787112C0E4C456C00A7191F /* array.lisp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = array.lisp; sourceTree = ""; }; A787112E0E4C459200A7191F /* globals.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = globals.m; sourceTree = ""; }; A787112F0E4C459200A7191F /* MLKArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKArray.m; sourceTree = ""; }; - A78711300E4C459200A7191F /* MLKCompiledProcedure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKCompiledProcedure.m; sourceTree = ""; }; A78711310E4C459200A7191F /* MLKForeignProcedure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKForeignProcedure.m; sourceTree = ""; }; A78711360E4C45A300A7191F /* globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = globals.h; sourceTree = ""; }; A78711370E4C45A300A7191F /* MLKArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKArray.h; sourceTree = ""; }; - A78711380E4C45A300A7191F /* MLKCompiledProcedure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKCompiledProcedure.h; sourceTree = ""; }; A78711390E4C45A300A7191F /* MLKForeignProcedure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKForeignProcedure.h; sourceTree = ""; }; A78713800E4EFF4000A7191F /* MLKForm.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKForm.m; sourceTree = ""; }; A78713810E4EFF4000A7191F /* MLKLLVMCompiler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MLKLLVMCompiler.mm; sourceTree = ""; }; A78713840E4EFF5D00A7191F /* MLKForm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKForm.h; sourceTree = ""; }; - A78713850E4EFF5D00A7191F /* MLKLLVMCompiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKLLVMCompiler.h; sourceTree = ""; }; + A78713850E4EFF5D00A7191F /* MLKLLVMCompiler.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = MLKLLVMCompiler.h; sourceTree = ""; }; A78713860E4EFF5D00A7191F /* special-symbols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "special-symbols.h"; sourceTree = ""; }; A787138B0E4EFF8A00A7191F /* ffi.lisp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ffi.lisp; sourceTree = ""; }; A787138C0E4EFF8A00A7191F /* package.lisp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = package.lisp; sourceTree = ""; }; @@ -560,12 +560,12 @@ A7E5C48C0E2169CE00A01D81 /* Headers */ = { isa = PBXGroup; children = ( + A72E9E370E51CB0500BDE40F /* MLKCompiledClosure.h */, A78713840E4EFF5D00A7191F /* MLKForm.h */, A78713850E4EFF5D00A7191F /* MLKLLVMCompiler.h */, A78713860E4EFF5D00A7191F /* special-symbols.h */, A78711360E4C45A300A7191F /* globals.h */, A78711370E4C45A300A7191F /* MLKArray.h */, - A78711380E4C45A300A7191F /* MLKCompiledProcedure.h */, A78711390E4C45A300A7191F /* MLKForeignProcedure.h */, A7A8338C0E476D0D005D64E0 /* functions.h */, A7A8338D0E476D0D005D64E0 /* MLKBackquoteReader.h */, @@ -617,11 +617,11 @@ A7E5C48D0E216A0E00A01D81 /* Source Files */ = { isa = PBXGroup; children = ( + A72E9E390E51CB1300BDE40F /* MLKCompiledClosure.m */, A78713800E4EFF4000A7191F /* MLKForm.m */, A78713810E4EFF4000A7191F /* MLKLLVMCompiler.mm */, A787112E0E4C459200A7191F /* globals.m */, A787112F0E4C459200A7191F /* MLKArray.m */, - A78711300E4C459200A7191F /* MLKCompiledProcedure.m */, A78711310E4C459200A7191F /* MLKForeignProcedure.m */, A7A833800E476CF3005D64E0 /* functions.m */, A7A833810E476CF3005D64E0 /* MLKBackquoteReader.m */, @@ -717,11 +717,11 @@ A7A833970E476D0D005D64E0 /* MLKValuesFunction.h in Headers */, A787113A0E4C45A300A7191F /* globals.h in Headers */, A787113B0E4C45A300A7191F /* MLKArray.h in Headers */, - A787113C0E4C45A300A7191F /* MLKCompiledProcedure.h in Headers */, A787113D0E4C45A300A7191F /* MLKForeignProcedure.h in Headers */, A78713870E4EFF5D00A7191F /* MLKForm.h in Headers */, A78713880E4EFF5D00A7191F /* MLKLLVMCompiler.h in Headers */, A78713890E4EFF5D00A7191F /* special-symbols.h in Headers */, + A72E9E380E51CB0500BDE40F /* MLKCompiledClosure.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -827,10 +827,10 @@ A7A8338B0E476CF3005D64E0 /* MLKValuesFunction.m in Sources */, A78711320E4C459200A7191F /* globals.m in Sources */, A78711330E4C459200A7191F /* MLKArray.m in Sources */, - A78711340E4C459200A7191F /* MLKCompiledProcedure.m in Sources */, A78711350E4C459200A7191F /* MLKForeignProcedure.m in Sources */, A78713820E4EFF4000A7191F /* MLKForm.m in Sources */, A78713830E4EFF4000A7191F /* MLKLLVMCompiler.mm in Sources */, + A72E9E3A0E51CB1300BDE40F /* MLKCompiledClosure.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; -- cgit v1.2.3 From 02f0cad354a6e2d5c990e18b0090160eb74142cc Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Tue, 12 Aug 2008 23:10:09 +0200 Subject: Update Xcode project. --- Toilet Lisp.xcodeproj/project.pbxproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Toilet Lisp.xcodeproj/project.pbxproj b/Toilet Lisp.xcodeproj/project.pbxproj index aa19886..a2e31b2 100644 --- a/Toilet Lisp.xcodeproj/project.pbxproj +++ b/Toilet Lisp.xcodeproj/project.pbxproj @@ -9,6 +9,8 @@ /* Begin PBXBuildFile section */ A72E9E380E51CB0500BDE40F /* MLKCompiledClosure.h in Headers */ = {isa = PBXBuildFile; fileRef = A72E9E370E51CB0500BDE40F /* MLKCompiledClosure.h */; }; A72E9E3A0E51CB1300BDE40F /* MLKCompiledClosure.m in Sources */ = {isa = PBXBuildFile; fileRef = A72E9E390E51CB1300BDE40F /* MLKCompiledClosure.m */; }; + A72E9E6C0E5220A200BDE40F /* MLKLexicalContext-MLKLLVMCompilation.mm in Sources */ = {isa = PBXBuildFile; fileRef = A72E9E6B0E5220A200BDE40F /* MLKLexicalContext-MLKLLVMCompilation.mm */; }; + A72E9E6E0E5220B700BDE40F /* MLKLexicalContext-MLKLLVMCompilation.h in Headers */ = {isa = PBXBuildFile; fileRef = A72E9E6D0E5220B700BDE40F /* MLKLexicalContext-MLKLLVMCompilation.h */; }; A78711320E4C459200A7191F /* globals.m in Sources */ = {isa = PBXBuildFile; fileRef = A787112E0E4C459200A7191F /* globals.m */; }; A78711330E4C459200A7191F /* MLKArray.m in Sources */ = {isa = PBXBuildFile; fileRef = A787112F0E4C459200A7191F /* MLKArray.m */; }; A78711350E4C459200A7191F /* MLKForeignProcedure.m in Sources */ = {isa = PBXBuildFile; fileRef = A78711310E4C459200A7191F /* MLKForeignProcedure.m */; }; @@ -308,6 +310,8 @@ /* Begin PBXFileReference section */ A72E9E370E51CB0500BDE40F /* MLKCompiledClosure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKCompiledClosure.h; sourceTree = ""; }; A72E9E390E51CB1300BDE40F /* MLKCompiledClosure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKCompiledClosure.m; sourceTree = ""; }; + A72E9E6B0E5220A200BDE40F /* MLKLexicalContext-MLKLLVMCompilation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "MLKLexicalContext-MLKLLVMCompilation.mm"; sourceTree = ""; }; + A72E9E6D0E5220B700BDE40F /* MLKLexicalContext-MLKLLVMCompilation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MLKLexicalContext-MLKLLVMCompilation.h"; sourceTree = ""; }; A787112C0E4C456C00A7191F /* array.lisp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = array.lisp; sourceTree = ""; }; A787112E0E4C459200A7191F /* globals.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = globals.m; sourceTree = ""; }; A787112F0E4C459200A7191F /* MLKArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKArray.m; sourceTree = ""; }; @@ -560,6 +564,7 @@ A7E5C48C0E2169CE00A01D81 /* Headers */ = { isa = PBXGroup; children = ( + A72E9E6D0E5220B700BDE40F /* MLKLexicalContext-MLKLLVMCompilation.h */, A72E9E370E51CB0500BDE40F /* MLKCompiledClosure.h */, A78713840E4EFF5D00A7191F /* MLKForm.h */, A78713850E4EFF5D00A7191F /* MLKLLVMCompiler.h */, @@ -617,6 +622,7 @@ A7E5C48D0E216A0E00A01D81 /* Source Files */ = { isa = PBXGroup; children = ( + A72E9E6B0E5220A200BDE40F /* MLKLexicalContext-MLKLLVMCompilation.mm */, A72E9E390E51CB1300BDE40F /* MLKCompiledClosure.m */, A78713800E4EFF4000A7191F /* MLKForm.m */, A78713810E4EFF4000A7191F /* MLKLLVMCompiler.mm */, @@ -722,6 +728,7 @@ A78713880E4EFF5D00A7191F /* MLKLLVMCompiler.h in Headers */, A78713890E4EFF5D00A7191F /* special-symbols.h in Headers */, A72E9E380E51CB0500BDE40F /* MLKCompiledClosure.h in Headers */, + A72E9E6E0E5220B700BDE40F /* MLKLexicalContext-MLKLLVMCompilation.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -831,6 +838,7 @@ A78713820E4EFF4000A7191F /* MLKForm.m in Sources */, A78713830E4EFF4000A7191F /* MLKLLVMCompiler.mm in Sources */, A72E9E3A0E51CB1300BDE40F /* MLKCompiledClosure.m in Sources */, + A72E9E6C0E5220A200BDE40F /* MLKLexicalContext-MLKLLVMCompilation.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; -- cgit v1.2.3 From ae57d7eefdb5c22882c6572d5369fa30428efe98 Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Tue, 19 Aug 2008 17:30:52 +0200 Subject: Update Xcode project. --- Toilet Lisp.xcodeproj/project.pbxproj | 162 +++++++++------------------------- 1 file changed, 42 insertions(+), 120 deletions(-) diff --git a/Toilet Lisp.xcodeproj/project.pbxproj b/Toilet Lisp.xcodeproj/project.pbxproj index a2e31b2..038bebb 100644 --- a/Toilet Lisp.xcodeproj/project.pbxproj +++ b/Toilet Lisp.xcodeproj/project.pbxproj @@ -882,7 +882,10 @@ INSTALL_PATH = "$(HOME)/Library/Frameworks"; LIBRARY_SEARCH_PATHS = /opt/local/lib; MACOSX_DEPLOYMENT_TARGET = ""; - OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_CFLAGS = ( + "-DHAVE_FFI_H", + "-DUSE_LLVM", + ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-I/opt/local/include", @@ -899,29 +902,13 @@ "-L/opt/local/lib", "-lpthread", "-lm", - /opt/local/lib/LLVMX86.o, - /opt/local/lib/LLVMSparc.o, - /opt/local/lib/LLVMPIC16.o, - /opt/local/lib/LLVMMSIL.o, - /opt/local/lib/LLVMMips.o, - "-lLLVMLinker", "-lLLVMipo", - /opt/local/lib/LLVMInterpreter.o, - "-lLLVMInstrumentation", - /opt/local/lib/LLVMIA64.o, + "-lLLVMLinker", + "-lLLVMArchive", + "-lLLVMBitReader", /opt/local/lib/LLVMExecutionEngine.o, /opt/local/lib/LLVMJIT.o, - "-lLLVMDebugger", - /opt/local/lib/LLVMCppBackend.o, - /opt/local/lib/LLVMCellSPU.o, - /opt/local/lib/LLVMCBackend.o, - "-lLLVMBitWriter", /opt/local/lib/LLVMPowerPC.o, - "-lLLVMAsmParser", - /opt/local/lib/LLVMARM.o, - "-lLLVMArchive", - "-lLLVMBitReader", - /opt/local/lib/LLVMAlpha.o, "-lLLVMSelectionDAG", "-lLLVMCodeGen", "-lLLVMScalarOpts", @@ -999,7 +986,10 @@ INSTALL_PATH = "$(HOME)/Library/Frameworks"; LIBRARY_SEARCH_PATHS = /opt/local/lib; MACOSX_DEPLOYMENT_TARGET = ""; - OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_CFLAGS = ( + "-DHAVE_FFI_H", + "-DUSE_LLVM", + ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-I/opt/local/include", @@ -1016,29 +1006,13 @@ "-L/opt/local/lib", "-lpthread", "-lm", - /opt/local/lib/LLVMX86.o, - /opt/local/lib/LLVMSparc.o, - /opt/local/lib/LLVMPIC16.o, - /opt/local/lib/LLVMMSIL.o, - /opt/local/lib/LLVMMips.o, - "-lLLVMLinker", "-lLLVMipo", - /opt/local/lib/LLVMInterpreter.o, - "-lLLVMInstrumentation", - /opt/local/lib/LLVMIA64.o, + "-lLLVMLinker", + "-lLLVMArchive", + "-lLLVMBitReader", /opt/local/lib/LLVMExecutionEngine.o, /opt/local/lib/LLVMJIT.o, - "-lLLVMDebugger", - /opt/local/lib/LLVMCppBackend.o, - /opt/local/lib/LLVMCellSPU.o, - /opt/local/lib/LLVMCBackend.o, - "-lLLVMBitWriter", /opt/local/lib/LLVMPowerPC.o, - "-lLLVMAsmParser", - /opt/local/lib/LLVMARM.o, - "-lLLVMArchive", - "-lLLVMBitReader", - /opt/local/lib/LLVMAlpha.o, "-lLLVMSelectionDAG", "-lLLVMCodeGen", "-lLLVMScalarOpts", @@ -1120,7 +1094,10 @@ INSTALL_PATH = "$(HOME)/Library/Frameworks"; LIBRARY_SEARCH_PATHS = /opt/local/lib; MACOSX_DEPLOYMENT_TARGET = ""; - OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_CFLAGS = ( + "-DHAVE_FFI_H", + "-DUSE_LLVM", + ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-I/opt/local/include", @@ -1137,29 +1114,13 @@ "-L/opt/local/lib", "-lpthread", "-lm", - /opt/local/lib/LLVMX86.o, - /opt/local/lib/LLVMSparc.o, - /opt/local/lib/LLVMPIC16.o, - /opt/local/lib/LLVMMSIL.o, - /opt/local/lib/LLVMMips.o, - "-lLLVMLinker", "-lLLVMipo", - /opt/local/lib/LLVMInterpreter.o, - "-lLLVMInstrumentation", - /opt/local/lib/LLVMIA64.o, + "-lLLVMLinker", + "-lLLVMArchive", + "-lLLVMBitReader", /opt/local/lib/LLVMExecutionEngine.o, /opt/local/lib/LLVMJIT.o, - "-lLLVMDebugger", - /opt/local/lib/LLVMCppBackend.o, - /opt/local/lib/LLVMCellSPU.o, - /opt/local/lib/LLVMCBackend.o, - "-lLLVMBitWriter", /opt/local/lib/LLVMPowerPC.o, - "-lLLVMAsmParser", - /opt/local/lib/LLVMARM.o, - "-lLLVMArchive", - "-lLLVMBitReader", - /opt/local/lib/LLVMAlpha.o, "-lLLVMSelectionDAG", "-lLLVMCodeGen", "-lLLVMScalarOpts", @@ -1203,7 +1164,10 @@ INSTALL_PATH = "$(HOME)/Library/Frameworks"; LIBRARY_SEARCH_PATHS = /opt/local/lib; MACOSX_DEPLOYMENT_TARGET = ""; - OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_CFLAGS = ( + "-DHAVE_FFI_H", + "-DUSE_LLVM", + ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-I/opt/local/include", @@ -1220,29 +1184,13 @@ "-L/opt/local/lib", "-lpthread", "-lm", - /opt/local/lib/LLVMX86.o, - /opt/local/lib/LLVMSparc.o, - /opt/local/lib/LLVMPIC16.o, - /opt/local/lib/LLVMMSIL.o, - /opt/local/lib/LLVMMips.o, - "-lLLVMLinker", "-lLLVMipo", - /opt/local/lib/LLVMInterpreter.o, - "-lLLVMInstrumentation", - /opt/local/lib/LLVMIA64.o, + "-lLLVMLinker", + "-lLLVMArchive", + "-lLLVMBitReader", /opt/local/lib/LLVMExecutionEngine.o, /opt/local/lib/LLVMJIT.o, - "-lLLVMDebugger", - /opt/local/lib/LLVMCppBackend.o, - /opt/local/lib/LLVMCellSPU.o, - /opt/local/lib/LLVMCBackend.o, - "-lLLVMBitWriter", /opt/local/lib/LLVMPowerPC.o, - "-lLLVMAsmParser", - /opt/local/lib/LLVMARM.o, - "-lLLVMArchive", - "-lLLVMBitReader", - /opt/local/lib/LLVMAlpha.o, "-lLLVMSelectionDAG", "-lLLVMCodeGen", "-lLLVMScalarOpts", @@ -1379,7 +1327,10 @@ INSTALL_PATH = "$(HOME)/Library/Frameworks"; LIBRARY_SEARCH_PATHS = /opt/local/lib; MACOSX_DEPLOYMENT_TARGET = ""; - OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_CFLAGS = ( + "-DHAVE_FFI_H", + "-DUSE_LLVM", + ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-I/opt/local/include", @@ -1396,29 +1347,13 @@ "-L/opt/local/lib", "-lpthread", "-lm", - /opt/local/lib/LLVMX86.o, - /opt/local/lib/LLVMSparc.o, - /opt/local/lib/LLVMPIC16.o, - /opt/local/lib/LLVMMSIL.o, - /opt/local/lib/LLVMMips.o, - "-lLLVMLinker", "-lLLVMipo", - /opt/local/lib/LLVMInterpreter.o, - "-lLLVMInstrumentation", - /opt/local/lib/LLVMIA64.o, + "-lLLVMLinker", + "-lLLVMArchive", + "-lLLVMBitReader", /opt/local/lib/LLVMExecutionEngine.o, /opt/local/lib/LLVMJIT.o, - "-lLLVMDebugger", - /opt/local/lib/LLVMCppBackend.o, - /opt/local/lib/LLVMCellSPU.o, - /opt/local/lib/LLVMCBackend.o, - "-lLLVMBitWriter", /opt/local/lib/LLVMPowerPC.o, - "-lLLVMAsmParser", - /opt/local/lib/LLVMARM.o, - "-lLLVMArchive", - "-lLLVMBitReader", - /opt/local/lib/LLVMAlpha.o, "-lLLVMSelectionDAG", "-lLLVMCodeGen", "-lLLVMScalarOpts", @@ -1460,7 +1395,10 @@ INSTALL_PATH = "$(HOME)/Library/Frameworks"; LIBRARY_SEARCH_PATHS = /opt/local/lib; MACOSX_DEPLOYMENT_TARGET = ""; - OTHER_CFLAGS = "-DHAVE_FFI_H"; + OTHER_CFLAGS = ( + "-DHAVE_FFI_H", + "-DUSE_LLVM", + ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-I/opt/local/include", @@ -1477,29 +1415,13 @@ "-L/opt/local/lib", "-lpthread", "-lm", - /opt/local/lib/LLVMX86.o, - /opt/local/lib/LLVMSparc.o, - /opt/local/lib/LLVMPIC16.o, - /opt/local/lib/LLVMMSIL.o, - /opt/local/lib/LLVMMips.o, - "-lLLVMLinker", "-lLLVMipo", - /opt/local/lib/LLVMInterpreter.o, - "-lLLVMInstrumentation", - /opt/local/lib/LLVMIA64.o, + "-lLLVMLinker", + "-lLLVMArchive", + "-lLLVMBitReader", /opt/local/lib/LLVMExecutionEngine.o, /opt/local/lib/LLVMJIT.o, - "-lLLVMDebugger", - /opt/local/lib/LLVMCppBackend.o, - /opt/local/lib/LLVMCellSPU.o, - /opt/local/lib/LLVMCBackend.o, - "-lLLVMBitWriter", /opt/local/lib/LLVMPowerPC.o, - "-lLLVMAsmParser", - /opt/local/lib/LLVMARM.o, - "-lLLVMArchive", - "-lLLVMBitReader", - /opt/local/lib/LLVMAlpha.o, "-lLLVMSelectionDAG", "-lLLVMCodeGen", "-lLLVMScalarOpts", -- cgit v1.2.3 From 54961d09a75b3b7c3dc411c47567caf0d963dfbf Mon Sep 17 00:00:00 2001 From: Matthias Benkard Date: Tue, 19 Aug 2008 17:31:45 +0200 Subject: Make Toilet Lisp compile with LLVM 2.3. --- GNUmakefile | 8 ++++---- MLKLLVMCompiler.mm | 4 ++++ Toilet Lisp.xcodeproj/project.pbxproj | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 7fb8754..24bfd8f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -72,11 +72,11 @@ ToiletKit_LDFLAGS = -lgmp -lffi -ldl USE_LLVM := YES ifeq ($(USE_LLVM),YES) -ADDITIONAL_OBJCCFLAGS = $(ADDITIONAL_OBJCFLAGS) +ADDITIONAL_OBJCCFLAGS += $(ADDITIONAL_OBJCFLAGS) ToiletKit_OBJC_FILES += MLKLexicalContext-MLKLLVMCompilation.m -ToiletKit_OBJCC_FILES = MLKLLVMCompiler.mm -ToiletKit_OBJCFLAGS = -DUSE_LLVM -ToiletKit_OBJCCFLAGS = -DUSE_LLVM `llvm-config --cxxflags` $(ToiletKit_OBJCFLAGS) +ToiletKit_OBJCC_FILES += MLKLLVMCompiler.mm +ToiletKit_OBJCFLAGS += -DUSE_LLVM -DLLVM_MAJOR_VERSION=`llvm-config --version | cut -f 1 -d.` -DLLVM_MINOR_VERSION=`llvm-config --version | cut -f 2 -d. | sed s/svn//` +ToiletKit_OBJCCFLAGS += `llvm-config --cxxflags` $(ToiletKit_OBJCFLAGS) ToiletKit_LDFLAGS += `llvm-config --ldflags` `llvm-config --libs backend engine linker codegen transformutils scalaropts analysis ipo` endif diff --git a/MLKLLVMCompiler.mm b/MLKLLVMCompiler.mm index aa0ab79..745be44 100644 --- a/MLKLLVMCompiler.mm +++ b/MLKLLVMCompiler.mm @@ -51,7 +51,11 @@ using namespace llvm; static ExecutionEngine *execution_engine; static llvm::Module *module; +#if defined(LLVM_MAJOR_VERSION) && (LLVM_MAJOR_VERSION <= 2) && (LLVM_MINOR_VERSION <= 3) +static IRBuilder builder; +#else static IRBuilder builder; +#endif static FunctionPassManager *fpm; static PointerType *PointerTy; static ModuleProvider *module_provider; diff --git a/Toilet Lisp.xcodeproj/project.pbxproj b/Toilet Lisp.xcodeproj/project.pbxproj index 038bebb..acb9d51 100644 --- a/Toilet Lisp.xcodeproj/project.pbxproj +++ b/Toilet Lisp.xcodeproj/project.pbxproj @@ -308,6 +308,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + A720D3670E5B1CB700734638 /* GNUmakefile */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; languageSpecificationIdentifier = make; path = GNUmakefile; sourceTree = ""; }; A72E9E370E51CB0500BDE40F /* MLKCompiledClosure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLKCompiledClosure.h; sourceTree = ""; }; A72E9E390E51CB1300BDE40F /* MLKCompiledClosure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLKCompiledClosure.m; sourceTree = ""; }; A72E9E6B0E5220A200BDE40F /* MLKLexicalContext-MLKLLVMCompilation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "MLKLexicalContext-MLKLLVMCompilation.mm"; sourceTree = ""; }; @@ -543,6 +544,7 @@ A7E5C3CC0E21682800A01D81 = { isa = PBXGroup; children = ( + A720D3670E5B1CB700734638 /* GNUmakefile */, A7A834A40E477B86005D64E0 /* Lisp Files */, A7E5C55B0E21740C00A01D81 /* Foundation.framework */, A7E5C48D0E216A0E00A01D81 /* Source Files */, @@ -885,6 +887,8 @@ OTHER_CFLAGS = ( "-DHAVE_FFI_H", "-DUSE_LLVM", + "-DLLVM_MAJOR_VERSION=2", + "-DLLVM_MINOR_VERSION=3", ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -989,6 +993,8 @@ OTHER_CFLAGS = ( "-DHAVE_FFI_H", "-DUSE_LLVM", + "-DLLVM_MAJOR_VERSION=2", + "-DLLVM_MINOR_VERSION=3", ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -1097,6 +1103,8 @@ OTHER_CFLAGS = ( "-DHAVE_FFI_H", "-DUSE_LLVM", + "-DLLVM_MAJOR_VERSION=2", + "-DLLVM_MINOR_VERSION=3", ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -1167,6 +1175,8 @@ OTHER_CFLAGS = ( "-DHAVE_FFI_H", "-DUSE_LLVM", + "-DLLVM_MAJOR_VERSION=2", + "-DLLVM_MINOR_VERSION=3", ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -1330,6 +1340,8 @@ OTHER_CFLAGS = ( "-DHAVE_FFI_H", "-DUSE_LLVM", + "-DLLVM_MAJOR_VERSION=2", + "-DLLVM_MINOR_VERSION=3", ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -1398,6 +1410,8 @@ OTHER_CFLAGS = ( "-DHAVE_FFI_H", "-DUSE_LLVM", + "-DLLVM_MAJOR_VERSION=2", + "-DLLVM_MINOR_VERSION=3", ); OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", -- cgit v1.2.3