[llvm-branch-commits] [cfe-branch] r124625 - in /cfe/branches/Apple/sill-IB: clang-merge-list.txt llvm-merge-list.txt

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jan 31 17:40:10 2011
New Revision: 124625

URL: http://llvm.org/viewvc/llvm-project?rev=124625&view=rev
Log:
Update merge lists.

Modified:
    cfe/branches/Apple/sill-IB/clang-merge-list.txt
    cfe/branches/Apple/sill-IB/llvm-merge-list.txt

Modified: cfe/branches/Apple/sill-IB/clang-merge-list.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/sill-IB/clang-merge-list.txt?rev=124625&r1=124624&r2=124625&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/sill-IB/clang-merge-list.txt Mon Jan 31 17:40:10 2011
@@ -568,3 +568,10 @@
 
 # <rdar://problem/8807535> Compile-as-you-type doesn't use same SSE options as real build
 124382
+
+# <rdar://problem/8925013> deadlock due to unsafe signal handler
+124612
+124613
+
+# <rdar://problem/8918721> crash at clang::SrcMgr::ContentCache::getBuffer const + 68
+124616

Modified: cfe/branches/Apple/sill-IB/llvm-merge-list.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/sill-IB/llvm-merge-list.txt?rev=124625&r1=124624&r2=124625&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/sill-IB/llvm-merge-list.txt Mon Jan 31 17:40:10 2011
@@ -193,3 +193,6 @@
 # <rdar://problem/8898416> build failure at -O0
 #
 # Required reversion of 123010 and 123008. Manually patched via Eric in r124427.
+
+# <rdar://problem/8926440> illegal instruction targeting sp
+119977