Subzero: Fix new issues after the LLVM 3.5 merge.

tests_lit/llvm2ice_tests/globalinit.pnacl.ll

 ; Test of global initializers.
 
 ; REQUIRES: allow_dump
 
 ; Test -ias=0 to test the lea "hack" until we are fully confident in -ias=1
 ; RUN: %p2i -i %s --args --verbose none -ias=0 | FileCheck %s
 
 ; Test -ias=1 and try to cross reference instructions w/ the symbol table.
 ; RUN: %p2i -i %s --args --verbose none \
 ; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
@@ skipping 100 matching lines @@
 ; CHECK: movl $ArrayUninit,
 
 ; llvm-objdump does not indicate what symbol the mov/relocation applies to
 ; so we grep for "mov {{.*}}, OFFSET", along with "OFFSET {{.*}} symbol" in
 ; the symbol table as a sanity check. NOTE: The symbol table sorting has no
 ; relation to the code's references.
 ; IAS-LABEL: main
 ; SYMTAB-LABEL: SYMBOL TABLE
 
 ; SYMTAB-DAG: 00000000 {{.*}} .data {{.*}} PrimitiveInit
-; IAS: mov {{.*}}, 0
+; IAS: mov {{.*}}, .data
 ; IAS-NEXT: R_386_32
 ; IAS: call
 
 ; SYMTAB-DAG: 00000000 {{.*}} .rodata {{.*}} PrimitiveInitConst
-; IAS: mov {{.*}}, 0
+; IAS: mov {{.*}}, .rodata
 ; IAS-NEXT: R_386_32
 ; IAS: call
 
 ; SYMTAB-DAG: 00000000 {{.*}} .bss {{.*}} PrimitiveInitStatic
-; IAS: mov {{.*}}, 0
+; IAS: mov {{.*}}, .bss
 ; IAS-NEXT: R_386_32
 ; IAS: call
 
 ; SYMTAB-DAG: 00000004 {{.*}} .bss {{.*}} PrimitiveUninit
-; IAS: mov {{.*}}, 4
+; IAS: mov {{.*}}, .bss
 ; IAS-NEXT: R_386_32
 ; IAS: call
 
 ; SYMTAB-DAG: 00000004{{.*}}.data{{.*}}ArrayInit
-; IAS: mov {{.*}}, 4
+; IAS: mov {{.*}}, .data
 ; IAS-NEXT: R_386_32
 ; IAS: call
 
 ; SYMTAB-DAG: 00000018 {{.*}} .data {{.*}} ArrayInitPartial
-; IAS: mov {{.*}}, 24
+; IAS: mov {{.*}}, .data
 ; IAS-NEXT: R_386_32
 ; IAS: call
 
 ; SYMTAB-DAG: 00000008 {{.*}} .bss {{.*}} ArrayUninit
-; IAS: mov {{.*}}, 8
+; IAS: mov {{.*}}, .bss
 ; IAS-NEXT: R_386_32
 ; IAS: call
 
 
 declare void @use(i32)
 
 define internal i32 @nacl_tp_tdb_offset(i32 %__0) {
 entry:
   ret i32 0
 }
 
 define internal i32 @nacl_tp_tls_offset(i32 %size) {
 entry:
   %result = sub i32 0, %size
   ret i32 %result
 }