diff --git a/llvm/test/CodeGen/X86/half.ll b/llvm/test/CodeGen/X86/half.ll
--- a/llvm/test/CodeGen/X86/half.ll
+++ b/llvm/test/CodeGen/X86/half.ll
@@ -954,11 +954,10 @@
   ret half %3
 }
 
-define dso_local void @brcond(half %0) {
+define void @brcond(half %0) #0 {
 ; CHECK-LIBCALL-LABEL: brcond:
 ; CHECK-LIBCALL:       # %bb.0: # %entry
 ; CHECK-LIBCALL-NEXT:    pushq %rax
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 16
 ; CHECK-LIBCALL-NEXT:    callq __extendhfsf2@PLT
 ; CHECK-LIBCALL-NEXT:    xorps %xmm1, %xmm1
 ; CHECK-LIBCALL-NEXT:    ucomiss %xmm1, %xmm0
@@ -968,7 +967,6 @@
 ; CHECK-LIBCALL-NEXT:    jne .LBB18_2
 ; CHECK-LIBCALL-NEXT:  # %bb.1: # %if.then
 ; CHECK-LIBCALL-NEXT:    popq %rax
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 8
 ; CHECK-LIBCALL-NEXT:    retq
 ; CHECK-LIBCALL-NEXT:  .LBB18_2: # %if.end
 ;
@@ -991,7 +989,6 @@
 ; CHECK-I686-LABEL: brcond:
 ; CHECK-I686:       # %bb.0: # %entry
 ; CHECK-I686-NEXT:    subl $12, %esp
-; CHECK-I686-NEXT:    .cfi_def_cfa_offset 16
 ; CHECK-I686-NEXT:    pinsrw $0, {{[0-9]+}}(%esp), %xmm0
 ; CHECK-I686-NEXT:    pextrw $0, %xmm0, %eax
 ; CHECK-I686-NEXT:    movw %ax, (%esp)
@@ -1006,7 +1003,6 @@
 ; CHECK-I686-NEXT:    jne .LBB18_2
 ; CHECK-I686-NEXT:  # %bb.1: # %if.then
 ; CHECK-I686-NEXT:    addl $12, %esp
-; CHECK-I686-NEXT:    .cfi_def_cfa_offset 4
 ; CHECK-I686-NEXT:    retl
 ; CHECK-I686-NEXT:  .LBB18_2: # %if.end
 entry:
@@ -1020,16 +1016,14 @@
   unreachable
 }
 
-define half @test_sqrt(half %0) {
+define half @test_sqrt(half %0) #0 {
 ; CHECK-LIBCALL-LABEL: test_sqrt:
 ; CHECK-LIBCALL:       # %bb.0: # %entry
 ; CHECK-LIBCALL-NEXT:    pushq %rax
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 16
 ; CHECK-LIBCALL-NEXT:    callq __extendhfsf2@PLT
 ; CHECK-LIBCALL-NEXT:    sqrtss %xmm0, %xmm0
 ; CHECK-LIBCALL-NEXT:    callq __truncsfhf2@PLT
 ; CHECK-LIBCALL-NEXT:    popq %rax
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 8
 ; CHECK-LIBCALL-NEXT:    retq
 ;
 ; BWON-F16C-LABEL: test_sqrt:
@@ -1047,7 +1041,6 @@
 ; CHECK-I686-LABEL: test_sqrt:
 ; CHECK-I686:       # %bb.0: # %entry
 ; CHECK-I686-NEXT:    subl $12, %esp
-; CHECK-I686-NEXT:    .cfi_def_cfa_offset 16
 ; CHECK-I686-NEXT:    pinsrw $0, {{[0-9]+}}(%esp), %xmm0
 ; CHECK-I686-NEXT:    pextrw $0, %xmm0, %eax
 ; CHECK-I686-NEXT:    movw %ax, (%esp)
@@ -1058,7 +1051,6 @@
 ; CHECK-I686-NEXT:    movss %xmm0, (%esp)
 ; CHECK-I686-NEXT:    calll __truncsfhf2
 ; CHECK-I686-NEXT:    addl $12, %esp
-; CHECK-I686-NEXT:    .cfi_def_cfa_offset 4
 ; CHECK-I686-NEXT:    retl
 entry:
   %1 = call half @llvm.sqrt.f16(half %0)
@@ -1067,7 +1059,7 @@
 
 declare half @llvm.sqrt.f16(half)
 
-define void @main.158() local_unnamed_addr #0 {
+define void @main.158() #0 {
 ; CHECK-LIBCALL-LABEL: main.158:
 ; CHECK-LIBCALL:       # %bb.0: # %entry
 ; CHECK-LIBCALL-NEXT:    pushq %rax
@@ -1143,23 +1135,14 @@
   ret void
 }
 
-define void @main.45() local_unnamed_addr {
+define void @main.45() #0 {
 ; CHECK-LIBCALL-LABEL: main.45:
 ; CHECK-LIBCALL:       # %bb.0: # %entry
 ; CHECK-LIBCALL-NEXT:    pushq %rbp
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 16
 ; CHECK-LIBCALL-NEXT:    pushq %r15
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 24
 ; CHECK-LIBCALL-NEXT:    pushq %r14
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 32
 ; CHECK-LIBCALL-NEXT:    pushq %rbx
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 40
 ; CHECK-LIBCALL-NEXT:    pushq %rax
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 48
-; CHECK-LIBCALL-NEXT:    .cfi_offset %rbx, -40
-; CHECK-LIBCALL-NEXT:    .cfi_offset %r14, -32
-; CHECK-LIBCALL-NEXT:    .cfi_offset %r15, -24
-; CHECK-LIBCALL-NEXT:    .cfi_offset %rbp, -16
 ; CHECK-LIBCALL-NEXT:    pinsrw $0, (%rax), %xmm0
 ; CHECK-LIBCALL-NEXT:    pextrw $0, %xmm0, %eax
 ; CHECK-LIBCALL-NEXT:    movd %eax, %xmm1
@@ -1183,15 +1166,10 @@
 ; CHECK-LIBCALL-NEXT:    movw %r15w, (%rax)
 ; CHECK-LIBCALL-NEXT:    movw %bp, (%rax)
 ; CHECK-LIBCALL-NEXT:    addq $8, %rsp
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 40
 ; CHECK-LIBCALL-NEXT:    popq %rbx
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 32
 ; CHECK-LIBCALL-NEXT:    popq %r14
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 24
 ; CHECK-LIBCALL-NEXT:    popq %r15
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 16
 ; CHECK-LIBCALL-NEXT:    popq %rbp
-; CHECK-LIBCALL-NEXT:    .cfi_def_cfa_offset 8
 ; CHECK-LIBCALL-NEXT:    retq
 ;
 ; BWON-F16C-LABEL: main.45:
@@ -1213,13 +1191,8 @@
 ; CHECK-I686-LABEL: main.45:
 ; CHECK-I686:       # %bb.0: # %entry
 ; CHECK-I686-NEXT:    pushl %edi
-; CHECK-I686-NEXT:    .cfi_def_cfa_offset 8
 ; CHECK-I686-NEXT:    pushl %esi
-; CHECK-I686-NEXT:    .cfi_def_cfa_offset 12
 ; CHECK-I686-NEXT:    subl $20, %esp
-; CHECK-I686-NEXT:    .cfi_def_cfa_offset 32
-; CHECK-I686-NEXT:    .cfi_offset %esi, -12
-; CHECK-I686-NEXT:    .cfi_offset %edi, -8
 ; CHECK-I686-NEXT:    pinsrw $0, (%eax), %xmm0
 ; CHECK-I686-NEXT:    pextrw $0, %xmm0, %eax
 ; CHECK-I686-NEXT:    movd %eax, %xmm0
@@ -1238,11 +1211,8 @@
 ; CHECK-I686-NEXT:    movw %di, (%eax)
 ; CHECK-I686-NEXT:    movw %si, (%eax)
 ; CHECK-I686-NEXT:    addl $20, %esp
-; CHECK-I686-NEXT:    .cfi_def_cfa_offset 12
 ; CHECK-I686-NEXT:    popl %esi
-; CHECK-I686-NEXT:    .cfi_def_cfa_offset 8
 ; CHECK-I686-NEXT:    popl %edi
-; CHECK-I686-NEXT:    .cfi_def_cfa_offset 4
 ; CHECK-I686-NEXT:    retl
 entry:
   %0 = load half, ptr undef, align 8