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

[Daniel Dunbar]

Author: ddunbar
Date: Thu Jan 27 14:11:59 2011
New Revision: 124415

URL: http://llvm.org/viewvc/llvm-project?rev=124415&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=124415&r1=124414&r2=124415&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/clang-merge-list.txt (original)
+++ cfe/branches/Apple/sill-IB/clang-merge-list.txt Thu Jan 27 14:11:59 2011
@@ -551,3 +551,18 @@
 
 # <rdar://problem/8858342> libclang does not honor -W/-w flags
 123793
+
+# <rdar://problem/8494734> clang doesn't support register pinning
+122643
+
+# <rdar://problem/8910446> clang fails to build Firefox 4
+123871
+
+## <rdar://problem/8913298> Upcasts which discard qualifiers are treated as bitcasts
+#124340 (custom merge)
+
+# <rdar://problem/8757124> Wrong value showing in debugger when variable name reused.
+123802
+
+# <rdar://problem/8807535> Compile-as-you-type doesn't use same SSE options as real build
+124382

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=124415&r1=124414&r2=124415&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/sill-IB/llvm-merge-list.txt Thu Jan 27 14:11:59 2011
@@ -187,6 +187,5 @@
 # <rdar://problem/8795958> clang crash
 122104
 
-# <rdar://problem/8913298> Upcasts which discard qualifiers are treated as bitcasts
-124340
-
+# <rdar://problem/8876232> __thread implementation doesn't preserve enough registers (ABI issue)
+123712