Hello community,
here is the log from the commit of package Mesa for openSUSE:Factory
checked in at Thu Oct 6 14:57:21 CEST 2011.
--------
--- openSUSE:Factory/Mesa/Mesa.changes 2011-09-23 01:50:48.000000000 +0200
+++ Mesa/Mesa.changes 2011-10-05 23:58:35.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Oct 06 21:58:00 UTC 2011 - idonmez@suse.com
+
+- Update Mesa-llvm-3.0.patch again to fix compilation
+
+-------------------------------------------------------------------
+Thu Sep 29 20:53:53 UTC 2011 - idonmez@suse.com
+
+- Update Mesa-llvm-3.0.patch for new llvm snapshot
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Mesa-llvm-3.0.patch ++++++
--- /var/tmp/diff_new_pack.dFs0an/_old 2011-10-06 14:57:15.000000000 +0200
+++ /var/tmp/diff_new_pack.dFs0an/_new 2011-10-06 14:57:15.000000000 +0200
@@ -1,15 +1,5 @@
-From 4a468de2d78fc5a9e6de40a9dae09669ec556fc5 Mon Sep 17 00:00:00 2001
-From: Tobias Droste
-Date: Sun, 04 Sep 2011 01:14:23 +0000
-Subject: gallivm: fix build with LLVM 3.0svn
-
-LLVM 3.0svn moved TargetRegistry.h and TargetSelect.h.
-See revision 138450 of LLVM.
-
-Signed-off-by: Tobias Droste
----
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index e252607..401e0e2 100644
+index 29dfb86..f44749d 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -27,17 +27,23 @@
@@ -40,56 +30,76 @@
#if HAVE_LLVM >= 0x0207
#include
---
-cgit v0.9.0.2-2-gbebe
-From 973221968117c50b141b700350d2e83befff4fce Mon Sep 17 00:00:00 2001
-From: ojab
-Date: Sat, 10 Sep 2011 19:23:20 +0400
-Subject: [PATCH] gallivm: fix build with LLVM 3.0svn
-
-LLVM 3.0svn refactored instprinter and mcdisassembler to take a SubtargetInfo.
-See revision 139237 of LLVM.
----
- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 14 +++++++++++++-
- 1 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index 401e0e2..b8a97da 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -210,11 +210,20 @@ lp_disassemble(const void* func)
+@@ -193,14 +199,23 @@ lp_disassemble(const void* func)
+
+ InitializeAllDisassemblers();
+
++#if HAVE_LLVM >= 0x0300
++ OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(Triple));
++#else
+ OwningPtr<const MCAsmInfo> AsmInfo(T->createAsmInfo(Triple));
++#endif
+
+ if (!AsmInfo) {
+ debug_printf("error: no assembly info for target %s\n", Triple.c_str());
return;
}
+#if HAVE_LLVM >= 0x0300
-+ const MCSubtargetInfo *STI = T->createMCSubtargetInfo(Triple.c_str(), "", "");
-+ if (!STI) {
-+ debug_printf("error: no subtarget info for target %s\n", Triple.c_str());
-+ return;
-+ }
++ const MCSubtargetInfo *STI = T->createMCSubtargetInfo(Triple, sys::getHostCPUName(), "");
+ OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler(*STI));
-+#else
++#else
OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler());
++#endif
if (!DisAsm) {
debug_printf("error: no disassembler for target %s\n", Triple.c_str());
return;
- }
-+#endif
-
- raw_debug_ostream Out;
-
-@@ -223,7 +232,10 @@ lp_disassemble(const void* func)
+@@ -213,7 +228,11 @@ lp_disassemble(const void* func)
#else
int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
#endif
-#if HAVE_LLVM >= 0x0208
++
+#if HAVE_LLVM >= 0x0300
+ OwningPtr<MCInstPrinter> Printer(
-+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
+#elif HAVE_LLVM >= 0x0208
OwningPtr<MCInstPrinter> Printer(
T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo));
#else
---
-1.7.6
-
+@@ -253,7 +272,11 @@ lp_disassemble(const void* func)
+
+ if (!DisAsm->getInstruction(Inst, Size, memoryObject,
+ pc,
+- nulls())) {
++#if HAVE_LLVM >= 0x0300
++ nulls(), nulls())) {
++#else
++ nulls())) {
++#endif
+ debug_printf("invalid\n");
+ pc += 1;
+ }
+@@ -276,7 +299,9 @@ lp_disassemble(const void* func)
+ * Print the instruction.
+ */
+
+-#if HAVE_LLVM >= 0x208
++#if HAVE_LLVM >= 0x0300
++ Printer->printInst(&Inst, Out, "");
++#elif HAVE_LLVM >= 0x208
+ Printer->printInst(&Inst, Out);
+ #else
+ Printer->printInst(&Inst);
+@@ -289,7 +314,11 @@
+
+ pc += Size;
+
++#if HAVE_LLVM >= 0x0300
++ const MCInstrDesc &TID = TII->get(Inst.getOpcode());
++#else
+ const TargetInstrDesc &TID = TII->get(Inst.getOpcode());
++#endif
+
+ /*
+ * Keep track of forward jumps to a nearby address.
++++++ U_Mesa-7.11-llvm3.patch ++++++
--- /var/tmp/diff_new_pack.dFs0an/_old 2011-10-06 14:57:16.000000000 +0200
+++ /var/tmp/diff_new_pack.dFs0an/_new 2011-10-06 14:57:16.000000000 +0200
@@ -1,34 +1,6 @@
Makes Mesa work with LLVM3 (also pre-releases).
Included in Mesa in post-11.7
-Index: src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-===================================================================
---- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp.orig
-+++ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -193,7 +193,11 @@ lp_disassemble(const void* func)
-
- InitializeAllDisassemblers();
-
-+#if HAVE_LLVM >= 0x0300
-+ OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(Triple));
-+#else
- OwningPtr<const MCAsmInfo> AsmInfo(T->createAsmInfo(Triple));
-+#endif
-
- if (!AsmInfo) {
- debug_printf("error: no assembly info for target %s\n", Triple.c_str());
-@@ -289,7 +293,11 @@ lp_disassemble(const void* func)
-
- pc += Size;
-
-+#if HAVE_LLVM >= 0x0300
-+ const MCInstrDesc &TID = TII->get(Inst.getOpcode());
-+#else
- const TargetInstrDesc &TID = TII->get(Inst.getOpcode());
-+#endif
-
- /*
- * Keep track of forward jumps to a nearby address.
Index: src/gallium/auxiliary/gallivm/lp_bld_type.c
===================================================================
--- src/gallium/auxiliary/gallivm/lp_bld_type.c.orig
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org