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

[Daniel Dunbar]

Author: ddunbar
Date: Mon Feb 28 16:57:33 2011
New Revision: 126707

URL: http://llvm.org/viewvc/llvm-project?rev=126707&view=rev
Log:
Sync 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=126707&r1=126706&r2=126707&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/sill-IB/clang-merge-list.txt Mon Feb 28 16:57:33 2011
@@ -594,3 +594,15 @@
 
 # <rdar://problem/8939444> clang loses symbol coloring & index support
 124971 (custom patch: clang-8939444.patch)
+
+# <rdar://problem/8981530> use most recent 'as' for compiler-rt build
+125328
+
+# <rdar://problem/8984201> ObjC syntax coloring seems arbitrary(?)
+124800 (custom patch: clang-8984201.patch)
+
+# <rdar://problem/8956193> crash on AST load
+125434
+
+# <rdar://problem/8939352> missing completion for -observeValueForKeyPath:ofObject:change:context:
+125977 (custom patch: rdar-8939352.patch)

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=126707&r1=126706&r2=126707&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/sill-IB/llvm-merge-list.txt Mon Feb 28 16:57:33 2011
@@ -199,3 +199,6 @@
 
 # <rdar://problem/8960959> crash during thumb isel
 123864
+
+# <rdar://problem/9060168> lto.h shouldn't depend on System/DataTypes.h
+123038