Mesa (7.11): gallivm: Re-enable LLVMUnionTypeKind case for llvm-2.7 only.

Brian Paul brianp at kemper.freedesktop.org
Mon Dec 5 16:02:59 UTC 2011


Module: Mesa
Branch: 7.11
Commit: 32f4a83fe894941be26505c9c65c2d9e3d1f0da8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=32f4a83fe894941be26505c9c65c2d9e3d1f0da8

Author: Vinson Lee <vlee at vmware.com>
Date:   Mon Jul 11 14:08:24 2011 -0700

gallivm: Re-enable LLVMUnionTypeKind case for llvm-2.7 only.

LLVMUnionTypeKind is not in llvm-2.6, llvm-2.8, llvm-2.9, or llvm-3.0svn.
(cherry picked from commit 1844ae7e7e2285f52dc0ecd42194ccc47e3137ef)

---

 src/gallium/auxiliary/gallivm/lp_bld_type.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.c b/src/gallium/auxiliary/gallivm/lp_bld_type.c
index 11a2b05..efd159f 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_type.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.c
@@ -333,10 +333,10 @@ lp_typekind_name(LLVMTypeKind t)
       return "LLVMVectorTypeKind";
    case LLVMMetadataTypeKind:
       return "LLVMMetadataTypeKind";
-   /* Only in LLVM 2.7 and later???
+#if HAVE_LLVM == 0x0207
    case LLVMUnionTypeKind:
       return "LLVMUnionTypeKind";
-   */
+#endif
    default:
       return "unknown LLVMTypeKind";
    }




More information about the mesa-commit mailing list