Changes from 3.7 merge to files not in upstream

test/NaCl/X86/ro-jumptable.ll

Index: test/NaCl/X86/ro-jumptable.ll
diff --git a/test/NaCl/X86/ro-jumptable.ll b/test/NaCl/X86/ro-jumptable.ll
index 9defc1b88e8899c4c94bd9281e29fa0539cce655..79538c33584b430ae69b7c63dfd5f32441efb188 100644
--- a/test/NaCl/X86/ro-jumptable.ll
+++ b/test/NaCl/X86/ro-jumptable.ll
@@ -39,11 +39,12 @@ sw.epilog:                                        ; preds = %sw.bb5, %entry
 
 ; CHECK: .section .text.foo_linkonce,"axG",@progbits,foo_linkonce,comdat
 ; CHECK: @foo_linkonce
-; Check that the jump table for the linkonce_odr function goes into a comdat
+; Check that the jump table for the comdat function goes into a comdat
 ; group uniqued like the function
 ; CHECK: .section .rodata.foo_linkonce,"aG",@progbits,foo_linkonce,comdat
 ; CHECK: .long .LBB1
-define linkonce_odr void @foo_linkonce(i32 %a) {
+$foo_linkonce = comdat any
+define linkonce_odr void @foo_linkonce(i32 %a) comdat {
 entry:
   switch i32 %a, label %sw.epilog [
     i32 3, label %sw.bb