Author: Armin Rigo <ar...@tunes.org>
Branch:
Changeset: r1057:526f7325d475
Date: 2014-03-16 19:45 +0100
http://bitbucket.org/pypy/stmgc/changeset/526f7325d475/
Log: merge heads
diff --git a/c7/llvmfix/addrspacecast-in-constant.diff
b/c7/llvmfix/addrspacecast-in-constant.diff
--- a/c7/llvmfix/addrspacecast-in-constant.diff
+++ b/c7/llvmfix/addrspacecast-in-constant.diff
@@ -1,8 +1,8 @@
Index: lib/CodeGen/AsmPrinter/AsmPrinter.cpp
===================================================================
---- lib/CodeGen/AsmPrinter/AsmPrinter.cpp (revision 203791)
-+++ lib/CodeGen/AsmPrinter/AsmPrinter.cpp (working copy)
-@@ -1529,6 +1529,8 @@
+--- lib/CodeGen/AsmPrinter/AsmPrinter.cpp (revision 201645)
++++ lib/CodeGen/AsmPrinter/AsmPrinter.cpp (working copy)
+@@ -1617,6 +1617,8 @@
Ctx);
}
diff --git a/c7/llvmfix/no-introduce-bogus-cast-in-combine.diff
b/c7/llvmfix/no-introduce-bogus-cast-in-combine.diff
--- a/c7/llvmfix/no-introduce-bogus-cast-in-combine.diff
+++ b/c7/llvmfix/no-introduce-bogus-cast-in-combine.diff
@@ -1,6 +1,6 @@
Index: lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
===================================================================
---- lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp (revision
203791)
+--- lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp (revision
201645)
+++ lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp (working copy)
@@ -299,6 +299,17 @@
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
