Subzero: Clean up function header emission.

tests_lit/llvm2ice_tests/fp.pnacl.ll

 ; This tries to be a comprehensive test of f32 and f64 operations.
 ; The CHECK lines are only checking for basic instruction patterns
 ; that should be present regardless of the optimization level, so
 ; there are no special OPTM1 match lines.
 
-; RUN: %p2i --assemble --disassemble -i %s --args -O2 --verbose none \
-; RUN:   | FileCheck %s
-; RUN: %p2i --assemble --disassemble -i %s --args -Om1 --verbose none \
-; RUN:   | FileCheck %s
+; RUN: %p2i --filetype=obj --disassemble -i %s --args -O2 | FileCheck %s
+; RUN: %p2i --filetype=obj --disassemble -i %s --args -Om1 | FileCheck %s
 
 @__init_array_start = internal constant [0 x i8] zeroinitializer, align 4
 @__fini_array_start = internal constant [0 x i8] zeroinitializer, align 4
 @__tls_template_start = internal constant [0 x i8] zeroinitializer, align 8
 @__tls_template_alignment = internal constant [4 x i8] c"\01\00\00\00", align 4
 
 define internal i32 @doubleArgs(double %a, i32 %b, double %c) {
 entry:
   ret i32 %b
 }
@@ skipping 1156 matching lines @@
 define internal double @selectDoubleVarVar(double %a, double %b) {
 entry:
   %cmp = fcmp olt double %a, %b
   %cond = select i1 %cmp, double %a, double %b
   ret double %cond
 }
 ; CHECK-LABEL: selectDoubleVarVar
 ; CHECK: ucomisd
 ; CHECK: ja
 ; CHECK: fld