[Bug 66847] New: compilation broken with llvm 3.3

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=66847

          Priority: medium
            Bug ID: 66847
          Assignee: dri-devel at lists.freedesktop.org
           Summary: compilation broken with llvm 3.3
          Severity: normal
    Classification: Unclassified
                OS: All
          Reporter: marvin24 at gmx.de
          Hardware: Other
            Status: NEW
           Version: 9.1
         Component: Drivers/Gallium/r600
           Product: Mesa

r600 build is broken in 9.1 (stable branch) when using llvm 3.3 (also stable).

I got it compiling with


0ee3cc5 r600g: Add $(DEFINES) to AM_CXXFLAGS
3a11b9b radeon/llvm: remove uneeded inclusion
1d16c20 radeon/llvm: Fix build with LLVM 3.3

from upstream plus


--- a/src/gallium/drivers/r600/llvm_wrapper.cpp
+++ b/src/gallium/drivers/r600/llvm_wrapper.cpp
@@ -2,11 +2,13 @@
 #include <llvm/ADT/StringRef.h>
 #if HAVE_LLVM < 0x0303
 #include <llvm/LLVMContext.h>
+#include <llvm/Support/IRReader.h>
 #else
 #include <llvm/IR/LLVMContext.h>
+#include <llvm/IRReader/IRReader.h>
+#include <llvm/IR/Module.h>
 #endif
 #include <llvm/PassManager.h>
-#include <llvm/Support/IRReader.h>
 #include <llvm/Support/MemoryBuffer.h>
 #include <llvm/Support/SourceMgr.h>
 #include <llvm/Transforms/IPO.h>

but that doesn't seem to be sufficient because I get a lot of

EE r600_asm.c:2041 r600_bytecode_build - unsupported CF instruction
(0xFFFFFFFF)
EE r600_shader.c:160 r600_pipe_shader_create - building bytecode failed !
EE r600_state_common.c:756 r600_shader_select - Failed to build shader variant
(type=0) -22
EE r600_asm.c:2041 r600_bytecode_build - unsupported CF instruction
(0xFFFFFFFF)
EE r600_shader.c:160 r600_pipe_shader_create - building bytecode failed !
EE r600_state_common.c:756 r600_shader_select - Failed to build shader variant
(type=0) -22

messages (this was from glxgears).

I would be great if this could be fixed for Mesa-9.1.5 because many distros
will use it.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/dri-devel/attachments/20130712/10b36997/attachment.html>