Permalink
Browse files

Merge pull request #13 from Ralith/llvm3

Initial LLVM 3 compatibility
  • Loading branch information...
2 parents 97b4b2b + a75bef3 commit fbdd55cc2465f8696d252c0cc933057f972974ea @sellout sellout committed Jan 22, 2012
Showing with 21 additions and 14 deletions.
  1. +6 −9 src/cffi.lisp
  2. +15 −5 src/core/grovel.lisp
View
@@ -83,16 +83,13 @@
(define-foreign-library libllvm
(:darwin (:or (:default "libLLVM")
- (:default "libLLVM-2.9")
- (:default "libLLVM-2.8")
- (:default "libLLVM-2.7")))
+ (:default "libLLVM-3.1")
+ (:default "libLLVM-3.0")))
(:unix (:or "libLLVM.so" "libLLVM.so.1"
- "libLLVM-2.9.so" "libLLVM-2.9.so.1"
- "libLLVM-2.8.so" "libLLVM-2.8.so.1"
- "libLLVM-2.7.so" "libLLVM-2.7.so.1"))
+ "libLLVM-3.1.so" "libLLVM-3.1.so.1"
+ "libLLVM-3.0.so" "libLLVM-3.0.so.1"))
(t (:or (:default "libLLVM")
- (:default "libLLVM-2.9")
- (:default "libLLVM-2.8")
- (:default "libLLVM-2.7"))))
+ (:default "libLLVM-3.1")
+ (:default "libLLVM-3.0"))))
(use-foreign-library libllvm)
View
@@ -10,7 +10,6 @@
((:switch "LLVMSwitch"))
((:indirect-br "LLVMIndirectBr"))
((:invoke "LLVMInvoke"))
- ((:unwind "LLVMUnwind"))
((:unreachable "LLVMUnreachable"))
((:add "LLVMAdd"))
((:f-add "LLVMFAdd"))
@@ -56,7 +55,12 @@
((:insert-element "LLVMInsertElement"))
((:shuffle-vector "LLVMShuffleVector"))
((:extract-value "LLVMExtractValue"))
- ((:insert-value "LLVMInsertValue")))
+ ((:insert-value "LLVMInsertValue"))
+ ((:fence "LLVMFence"))
+ ((:atomic-cas "LLVMAtomicCmpXchg"))
+ ((:resume "LLVMResume"))
+ ((:landing-pad "LLVMLandingPad"))
+ ((:unwind "LLVMUnwind")))
(cenum type-kind
((:void "LLVMVoidTypeKind"))
@@ -71,9 +75,9 @@
((:struct "LLVMStructTypeKind"))
((:array "LLVMArrayTypeKind"))
((:pointer "LLVMPointerTypeKind"))
- ((:opaque "LLVMOpaqueTypeKind"))
((:vector "LLVMVectorTypeKind"))
- ((:metadata "LLVMMetadataTypeKind")))
+ ((:metadata "LLVMMetadataTypeKind"))
+ ((:x86-mmx "LLVMX86_MMXTypeKind")))
(cenum linkage
((:external "LLVMExternalLinkage"))
@@ -90,7 +94,9 @@
((:external-weak "LLVMExternalWeakLinkage"))
((:ghost "LLVMGhostLinkage"))
((:common "LLVMCommonLinkage"))
- ((:linker-private "LLVMLinkerPrivateLinkage")))
+ ((:linker-private "LLVMLinkerPrivateLinkage"))
+ ((:linker-private-weak "LLVMLinkerPrivateWeakLinkage"))
+ ((:linker-private-weak-auto "LLVMLinkerPrivateWeakDefAutoLinkage")))
(cenum visibility
((:default "LLVMDefaultVisibility"))
@@ -133,3 +139,7 @@
((:unordered-<= "LLVMRealULE"))
((:unordered-/= "LLVMRealUNE"))
((:true "LLVMRealPredicateTrue")))
+
+(cenum landing-pad-clause-type
+ ((:catch "LLVMLandingPadCatch"))
+ ((:filter "LLVMLandingPadFilter")))

0 comments on commit fbdd55c

Please sign in to comment.