diff --git a/llvm/test/CodeGen/PowerPC/aix-xcoff-data.ll b/llvm/test/CodeGen/PowerPC/aix-xcoff-data.ll
--- a/llvm/test/CodeGen/PowerPC/aix-xcoff-data.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-xcoff-data.ll
@@ -162,7 +162,7 @@
 
 ; OBJ:      Sections [
 ; OBJ:        Section {
-; OBJ-NEXT:     Index: 1
+; OBJ-NEXT:     Index: [[#OBJ_INDX:]]
 ; OBJ-NEXT:     Name: .text
 ; OBJ-NEXT:     PhysicalAddress: 0x0
 ; OBJ-NEXT:     VirtualAddress: 0x0
@@ -176,7 +176,7 @@
 ; OBJ-NEXT:   }
 
 ; OBJ:        Section {
-; OBJ-NEXT:     Index: 2
+; OBJ-NEXT:     Index: [[#OBJ_INDX+1]]
 ; OBJ-NEXT:     Name: .data
 ; OBJ-NEXT:     PhysicalAddress: 0x0
 ; OBJ-NEXT:     VirtualAddress: 0x0
@@ -190,7 +190,7 @@
 ; OBJ-NEXT:   }
 
 ; OBJ:        Section {
-; OBJ-NEXT:     Index: 3
+; OBJ-NEXT:     Index: [[#OBJ_INDX+2]]
 ; OBJ-NEXT:     Name: .bss
 ; OBJ-NEXT:     PhysicalAddress: 0x80
 ; OBJ-NEXT:     VirtualAddress: 0x80
@@ -210,7 +210,7 @@
 ; SYMS-NEXT: AddressSize: 32bit
 ; SYMS:      Symbols [
 ; SYMS-NEXT:   Symbol {
-; SYMS-NEXT:     Index: 0
+; SYMS-NEXT:     Index: [[#INDX:]]
 ; SYMS-NEXT:     Name: .file
 ; SYMS-NEXT:     Value (SymbolTableIndex): 0x0
 ; SYMS-NEXT:     Section: N_DEBUG
@@ -220,7 +220,7 @@
 ; SYMS-NEXT:     NumberOfAuxEntries: 0
 ; SYMS-NEXT:   }
 ; SYMS-NEXT:   Symbol {
-; SYMS-NEXT:     Index: [[#INDX:]]
+; SYMS-NEXT:     Index: [[#INDX+1]]
 ; SYMS-NEXT:     Name: .text
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x0
 ; SYMS-NEXT:     Section: .text
@@ -228,7 +228,7 @@
 ; SYMS-NEXT:     StorageClass: C_HIDEXT (0x6B)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+1]]
+; SYMS-NEXT:       Index: [[#INDX+2]]
 ; SYMS-NEXT:       SectionLen: 0
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
@@ -241,7 +241,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+2]]
+; SYMS-NEXT:     Index: [[#INDX+3]]
 ; SYMS-NEXT:     Name: .data
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x0
 ; SYMS-NEXT:     Section: .data
@@ -249,7 +249,7 @@
 ; SYMS-NEXT:     StorageClass: C_HIDEXT (0x6B)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+3]]
+; SYMS-NEXT:       Index: [[#INDX+4]]
 ; SYMS-NEXT:       SectionLen: 128
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
@@ -262,7 +262,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+4]]
+; SYMS-NEXT:     Index: [[#INDX+5]]
 ; SYMS-NEXT:     Name: ivar
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x0
 ; SYMS-NEXT:     Section: .data
@@ -270,8 +270,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+5]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+6]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -283,7 +283,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+6]]
+; SYMS-NEXT:     Index: [[#INDX+7]]
 ; SYMS-NEXT:     Name: llvar
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x8
 ; SYMS-NEXT:     Section: .data
@@ -291,8 +291,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+7]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+8]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -304,7 +304,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+8]]
+; SYMS-NEXT:     Index: [[#INDX+9]]
 ; SYMS-NEXT:     Name: svar
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x10
 ; SYMS-NEXT:     Section: .data
@@ -312,8 +312,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+9]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+10]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -325,7 +325,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+10]]
+; SYMS-NEXT:     Index: [[#INDX+11]]
 ; SYMS-NEXT:     Name: fvar
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x14
 ; SYMS-NEXT:     Section: .data
@@ -333,8 +333,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+11]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+12]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -346,7 +346,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+12]]
+; SYMS-NEXT:     Index: [[#INDX+13]]
 ; SYMS-NEXT:     Name: dvar
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x18
 ; SYMS-NEXT:     Section: .data
@@ -354,8 +354,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+13]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+14]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -367,7 +367,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+14]]
+; SYMS-NEXT:     Index: [[#INDX+15]]
 ; SYMS-NEXT:     Name: over_aligned
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x20
 ; SYMS-NEXT:     Section: .data
@@ -375,8 +375,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+15]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+16]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -388,7 +388,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+16]]
+; SYMS-NEXT:     Index: [[#INDX+17]]
 ; SYMS-NEXT:     Name: chrarray
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x28
 ; SYMS-NEXT:     Section: .data
@@ -396,8 +396,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+17]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+18]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -409,7 +409,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+18]]
+; SYMS-NEXT:     Index: [[#INDX+19]]
 ; SYMS-NEXT:     Name: dblarr
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x30
 ; SYMS-NEXT:     Section: .data
@@ -417,8 +417,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+19]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+20]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -430,7 +430,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+20]]
+; SYMS-NEXT:     Index: [[#INDX+21]]
 ; SYMS-NEXT:     Name: d_0
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x50
 ; SYMS-NEXT:     Section: .data
@@ -438,8 +438,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+21]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+22]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -451,7 +451,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+22]]
+; SYMS-NEXT:     Index: [[#INDX+23]]
 ; SYMS-NEXT:     Name: s_0
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x58
 ; SYMS-NEXT:     Section: .data
@@ -459,8 +459,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+23]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+24]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -472,7 +472,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+24]]
+; SYMS-NEXT:     Index: [[#INDX+25]]
 ; SYMS-NEXT:     Name: f_0
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x5C
 ; SYMS-NEXT:     Section: .data
@@ -480,8 +480,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+25]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+26]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -493,7 +493,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+26]]
+; SYMS-NEXT:     Index: [[#INDX+27]]
 ; SYMS-NEXT:     Name: astruct
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x60
 ; SYMS-NEXT:     Section: .data
@@ -501,8 +501,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+27]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+28]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -514,7 +514,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+28]]
+; SYMS-NEXT:     Index: [[#INDX+29]]
 ; SYMS-NEXT:     Name: bstruct
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x70
 ; SYMS-NEXT:     Section: .data
@@ -522,8 +522,8 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+29]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+2]]
+; SYMS-NEXT:       Index: [[#INDX+30]]
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX+3]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -535,7 +535,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+30]]
+; SYMS-NEXT:     Index: [[#INDX+31]]
 ; SYMS-NEXT:     Name: a
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x80
 ; SYMS-NEXT:     Section: .bss
@@ -543,7 +543,7 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+31]]
+; SYMS-NEXT:       Index: [[#INDX+32]]
 ; SYMS-NEXT:       SectionLen: 4
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
@@ -556,7 +556,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+32]]
+; SYMS-NEXT:     Index: [[#INDX+33]]
 ; SYMS-NEXT:     Name: b
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x88
 ; SYMS-NEXT:     Section: .bss
@@ -564,7 +564,7 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+33]]
+; SYMS-NEXT:       Index: [[#INDX+34]]
 ; SYMS-NEXT:       SectionLen: 8
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
@@ -577,7 +577,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+34]]
+; SYMS-NEXT:     Index: [[#INDX+35]]
 ; SYMS-NEXT:     Name: c
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x90
 ; SYMS-NEXT:     Section: .bss
@@ -585,7 +585,7 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+35]]
+; SYMS-NEXT:       Index: [[#INDX+36]]
 ; SYMS-NEXT:       SectionLen: 2
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
@@ -598,7 +598,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+36]]
+; SYMS-NEXT:     Index: [[#INDX+37]]
 ; SYMS-NEXT:     Name: d
 ; SYMS-NEXT:     Value (RelocatableAddress): 0x98
 ; SYMS-NEXT:     Section: .bss
@@ -606,7 +606,7 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+37]]
+; SYMS-NEXT:       Index: [[#INDX+38]]
 ; SYMS-NEXT:       SectionLen: 8
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
@@ -619,7 +619,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+38]]
+; SYMS-NEXT:     Index: [[#INDX+39]]
 ; SYMS-NEXT:     Name: f
 ; SYMS-NEXT:     Value (RelocatableAddress): 0xA0
 ; SYMS-NEXT:     Section: .bss
@@ -627,7 +627,7 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+39]]
+; SYMS-NEXT:       Index: [[#INDX+40]]
 ; SYMS-NEXT:       SectionLen: 4
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
@@ -640,7 +640,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+40]]
+; SYMS-NEXT:     Index: [[#INDX+41]]
 ; SYMS-NEXT:     Name: over_aligned_comm
 ; SYMS-NEXT:     Value (RelocatableAddress): 0xC0
 ; SYMS-NEXT:     Section: .bss
@@ -648,7 +648,7 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+41]]
+; SYMS-NEXT:       Index: [[#INDX+42]]
 ; SYMS-NEXT:       SectionLen: 8
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
@@ -661,7 +661,7 @@
 ; SYMS-NEXT:   }
 
 ; SYMS:        Symbol {
-; SYMS-NEXT:     Index: [[#INDX+42]]
+; SYMS-NEXT:     Index: [[#INDX+43]]
 ; SYMS-NEXT:     Name: array
 ; SYMS-NEXT:     Value (RelocatableAddress): 0xC8
 ; SYMS-NEXT:     Section: .bss
@@ -669,7 +669,7 @@
 ; SYMS-NEXT:     StorageClass: C_EXT (0x2)
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
-; SYMS-NEXT:       Index: [[#INDX+43]]
+; SYMS-NEXT:       Index: [[#INDX+44]]
 ; SYMS-NEXT:       SectionLen: 33
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
diff --git a/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll b/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll
--- a/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-xcoff-reloc.ll
@@ -148,7 +148,7 @@
 
 ; SYM:      Symbols [
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 0
+; SYM-NEXT:     Index: [[#INDX:]]
 ; SYM-NEXT:     Name: .file
 ; SYM-NEXT:     Value (SymbolTableIndex): 0x0
 ; SYM-NEXT:     Section: N_DEBUG
@@ -158,7 +158,7 @@
 ; SYM-NEXT:     NumberOfAuxEntries: 0
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 1
+; SYM-NEXT:     Index: [[#INDX+1]]
 ; SYM-NEXT:     Name: .bar
 ; SYM-NEXT:     Value (RelocatableAddress): 0x0
 ; SYM-NEXT:     Section: N_UNDEF
@@ -166,7 +166,7 @@
 ; SYM-NEXT:     StorageClass: C_EXT (0x2)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 2
+; SYM-NEXT:       Index: [[#INDX+2]]
 ; SYM-NEXT:       SectionLen: 0
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
@@ -178,7 +178,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 3
+; SYM-NEXT:     Index: [[#INDX+3]]
 ; SYM-NEXT:     Name: bar
 ; SYM-NEXT:     Value (RelocatableAddress): 0x0
 ; SYM-NEXT:     Section: N_UNDEF
@@ -186,7 +186,7 @@
 ; SYM-NEXT:     StorageClass: C_EXT (0x2)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 4
+; SYM-NEXT:       Index: [[#INDX+4]]
 ; SYM-NEXT:       SectionLen: 0
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
@@ -198,7 +198,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 5
+; SYM-NEXT:     Index: [[#INDX+5]]
 ; SYM-NEXT:     Name: .text
 ; SYM-NEXT:     Value (RelocatableAddress): 0x0
 ; SYM-NEXT:     Section: .text
@@ -206,7 +206,7 @@
 ; SYM-NEXT:     StorageClass: C_HIDEXT (0x6B)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 6
+; SYM-NEXT:       Index: [[#INDX+6]]
 ; SYM-NEXT:       SectionLen: 64
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
@@ -218,7 +218,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 7
+; SYM-NEXT:     Index: [[#INDX+7]]
 ; SYM-NEXT:     Name: .foo
 ; SYM-NEXT:     Value (RelocatableAddress): 0x0
 ; SYM-NEXT:     Section: .text
@@ -226,8 +226,8 @@
 ; SYM-NEXT:     StorageClass: C_EXT (0x2)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 8
-; SYM-NEXT:       ContainingCsectSymbolIndex: 5
+; SYM-NEXT:       Index: [[#INDX+8]]
+; SYM-NEXT:       ContainingCsectSymbolIndex: [[#INDX+5]]
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
 ; SYM-NEXT:       SymbolAlignmentLog2: 0
@@ -238,7 +238,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 9
+; SYM-NEXT:     Index: [[#INDX+9]]
 ; SYM-NEXT:     Name: .data
 ; SYM-NEXT:     Value (RelocatableAddress): 0x40
 ; SYM-NEXT:     Section: .data
@@ -246,7 +246,7 @@
 ; SYM-NEXT:     StorageClass: C_HIDEXT (0x6B)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 10
+; SYM-NEXT:       Index: [[#INDX+10]]
 ; SYM-NEXT:       SectionLen: 52
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
@@ -258,7 +258,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 11
+; SYM-NEXT:     Index: [[#INDX+11]]
 ; SYM-NEXT:     Name: globalA
 ; SYM-NEXT:     Value (RelocatableAddress): 0x40
 ; SYM-NEXT:     Section: .data
@@ -266,8 +266,8 @@
 ; SYM-NEXT:     StorageClass: C_EXT (0x2)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 12
-; SYM-NEXT:       ContainingCsectSymbolIndex: 9
+; SYM-NEXT:       Index: [[#INDX+12]]
+; SYM-NEXT:       ContainingCsectSymbolIndex: [[#INDX+9]]
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
 ; SYM-NEXT:       SymbolAlignmentLog2: 0
@@ -278,7 +278,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 13
+; SYM-NEXT:     Index: [[#INDX+13]]
 ; SYM-NEXT:     Name: globalB
 ; SYM-NEXT:     Value (RelocatableAddress): 0x44
 ; SYM-NEXT:     Section: .data
@@ -286,8 +286,8 @@
 ; SYM-NEXT:     StorageClass: C_EXT (0x2)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 14
-; SYM-NEXT:       ContainingCsectSymbolIndex: 9
+; SYM-NEXT:       Index: [[#INDX+14]]
+; SYM-NEXT:       ContainingCsectSymbolIndex: [[#INDX+9]]
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
 ; SYM-NEXT:       SymbolAlignmentLog2: 0
@@ -298,7 +298,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 15
+; SYM-NEXT:     Index: [[#INDX+15]]
 ; SYM-NEXT:     Name: arr
 ; SYM-NEXT:     Value (RelocatableAddress): 0x48
 ; SYM-NEXT:     Section: .data
@@ -306,8 +306,8 @@
 ; SYM-NEXT:     StorageClass: C_EXT (0x2)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 16
-; SYM-NEXT:       ContainingCsectSymbolIndex: 9
+; SYM-NEXT:       Index: [[#INDX+16]]
+; SYM-NEXT:       ContainingCsectSymbolIndex: [[#INDX+9]]
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
 ; SYM-NEXT:       SymbolAlignmentLog2: 0
@@ -318,7 +318,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 17
+; SYM-NEXT:     Index: [[#INDX+17]]
 ; SYM-NEXT:     Name: p
 ; SYM-NEXT:     Value (RelocatableAddress): 0x70
 ; SYM-NEXT:     Section: .data
@@ -326,8 +326,8 @@
 ; SYM-NEXT:     StorageClass: C_EXT (0x2)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 18
-; SYM-NEXT:       ContainingCsectSymbolIndex: 9
+; SYM-NEXT:       Index: [[#INDX+18]]
+; SYM-NEXT:       ContainingCsectSymbolIndex: [[#INDX+9]]
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
 ; SYM-NEXT:       SymbolAlignmentLog2: 0
@@ -338,7 +338,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 19
+; SYM-NEXT:     Index: [[#INDX+19]]
 ; SYM-NEXT:     Name: foo
 ; SYM-NEXT:     Value (RelocatableAddress): 0x74
 ; SYM-NEXT:     Section: .data
@@ -346,7 +346,7 @@
 ; SYM-NEXT:     StorageClass: C_EXT (0x2)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 20
+; SYM-NEXT:       Index: [[#INDX+20]]
 ; SYM-NEXT:       SectionLen: 12
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
@@ -358,7 +358,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 21
+; SYM-NEXT:     Index: [[#INDX+21]]
 ; SYM-NEXT:     Name: TOC
 ; SYM-NEXT:     Value (RelocatableAddress): 0x80
 ; SYM-NEXT:     Section: .data
@@ -366,7 +366,7 @@
 ; SYM-NEXT:     StorageClass: C_HIDEXT (0x6B)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 22
+; SYM-NEXT:       Index: [[#INDX+22]]
 ; SYM-NEXT:       SectionLen: 0
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
@@ -378,7 +378,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 23
+; SYM-NEXT:     Index: [[#INDX+23]]
 ; SYM-NEXT:     Name: globalA
 ; SYM-NEXT:     Value (RelocatableAddress): 0x80
 ; SYM-NEXT:     Section: .data
@@ -386,7 +386,7 @@
 ; SYM-NEXT:     StorageClass: C_HIDEXT (0x6B)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 24
+; SYM-NEXT:       Index: [[#INDX+24]]
 ; SYM-NEXT:       SectionLen: 4
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
@@ -398,7 +398,7 @@
 ; SYM-NEXT:     }
 ; SYM-NEXT:   }
 ; SYM-NEXT:   Symbol {
-; SYM-NEXT:     Index: 25
+; SYM-NEXT:     Index: [[#INDX+25]]
 ; SYM-NEXT:     Name: globalB
 ; SYM-NEXT:     Value (RelocatableAddress): 0x84
 ; SYM-NEXT:     Section: .data
@@ -406,7 +406,7 @@
 ; SYM-NEXT:     StorageClass: C_HIDEXT (0x6B)
 ; SYM-NEXT:     NumberOfAuxEntries: 1
 ; SYM-NEXT:     CSECT Auxiliary Entry {
-; SYM-NEXT:       Index: 26
+; SYM-NEXT:       Index: [[#INDX+26]]
 ; SYM-NEXT:       SectionLen: 4
 ; SYM-NEXT:       ParameterHashIndex: 0x0
 ; SYM-NEXT:       TypeChkSectNum: 0x0
diff --git a/llvm/test/CodeGen/PowerPC/aix-xcoff-rodata.ll b/llvm/test/CodeGen/PowerPC/aix-xcoff-rodata.ll
--- a/llvm/test/CodeGen/PowerPC/aix-xcoff-rodata.ll
+++ b/llvm/test/CodeGen/PowerPC/aix-xcoff-rodata.ll
@@ -138,7 +138,7 @@
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
 ; SYMS-NEXT:       Index: [[#INDX+3]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: 3
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -159,7 +159,7 @@
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
 ; SYMS-NEXT:       Index: [[#INDX+5]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: 3
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -180,7 +180,7 @@
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
 ; SYMS-NEXT:       Index: [[#INDX+7]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: 3
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -201,7 +201,7 @@
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
 ; SYMS-NEXT:       Index: [[#INDX+9]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: 3
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -222,7 +222,7 @@
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
 ; SYMS-NEXT:       Index: [[#INDX+11]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: 3
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -243,7 +243,7 @@
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
 ; SYMS-NEXT:       Index: [[#INDX+13]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: 3
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -264,7 +264,7 @@
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
 ; SYMS-NEXT:       Index: [[#INDX+15]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: 3
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
@@ -285,7 +285,7 @@
 ; SYMS-NEXT:     NumberOfAuxEntries: 1
 ; SYMS-NEXT:     CSECT Auxiliary Entry {
 ; SYMS-NEXT:       Index: [[#INDX+17]]
-; SYMS-NEXT:       ContainingCsectSymbolIndex: 3
+; SYMS-NEXT:       ContainingCsectSymbolIndex: [[#INDX]]
 ; SYMS-NEXT:       ParameterHashIndex: 0x0
 ; SYMS-NEXT:       TypeChkSectNum: 0x0
 ; SYMS-NEXT:       SymbolAlignmentLog2: 0
diff --git a/llvm/test/tools/llvm-readobj/XCOFF/symbols.test b/llvm/test/tools/llvm-readobj/XCOFF/symbols.test
--- a/llvm/test/tools/llvm-readobj/XCOFF/symbols.test
+++ b/llvm/test/tools/llvm-readobj/XCOFF/symbols.test
@@ -34,7 +34,7 @@
 SYMBOL32-NEXT: AddressSize: 32bit
 SYMBOL32-NEXT: Symbols [
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 0
+SYMBOL32-NEXT:     Index: [[#INDX:]]
 SYMBOL32-NEXT:     Name: .file
 SYMBOL32-NEXT:     Value (SymbolTableIndex): 0x0
 SYMBOL32-NEXT:     Section: N_DEBUG
@@ -43,23 +43,23 @@
 SYMBOL32-NEXT:     StorageClass: C_FILE (0x67)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 3
 SYMBOL32-NEXT:     File Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 1
+SYMBOL32-NEXT:       Index: [[#INDX+1]]
 SYMBOL32-NEXT:       Name: test8.c
 SYMBOL32-NEXT:       Type: XFT_FN (0x0)
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:     File Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 2
+SYMBOL32-NEXT:       Index: [[#INDX+2]]
 SYMBOL32-NEXT:       Name: Sun Apr 28 15:56:49 2019
 SYMBOL32-NEXT:       Type: XFT_CT (0x1)
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:     File Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 3
+SYMBOL32-NEXT:       Index: [[#INDX+3]]
 SYMBOL32-NEXT:       Name: IBM XL C for AIX, Version 16.1.0.2
 SYMBOL32-NEXT:       Type: XFT_CV (0x2)
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 4
+SYMBOL32-NEXT:     Index: [[#INDX+4]]
 SYMBOL32-NEXT:     Name: .text
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x0
 SYMBOL32-NEXT:     Section: .text
@@ -67,14 +67,14 @@
 SYMBOL32-NEXT:     StorageClass: C_STAT (0x3)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     Sect Auxiliary Entry For Stat {
-SYMBOL32-NEXT:       Index: 5
+SYMBOL32-NEXT:       Index: [[#INDX+5]]
 SYMBOL32-NEXT:       SectionLength: 256
 SYMBOL32-NEXT:       NumberOfRelocEnt: 4
 SYMBOL32-NEXT:       NumberOfLineNum: 0
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 6
+SYMBOL32-NEXT:     Index: [[#INDX+6]]
 SYMBOL32-NEXT:     Name: .data
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x100
 SYMBOL32-NEXT:     Section: .data
@@ -82,14 +82,14 @@
 SYMBOL32-NEXT:     StorageClass: C_STAT (0x3)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     Sect Auxiliary Entry For Stat {
-SYMBOL32-NEXT:       Index: 7
+SYMBOL32-NEXT:       Index: [[#INDX+7]]
 SYMBOL32-NEXT:       SectionLength: 60
 SYMBOL32-NEXT:       NumberOfRelocEnt: 11
 SYMBOL32-NEXT:       NumberOfLineNum: 0
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 8
+SYMBOL32-NEXT:     Index: [[#INDX+8]]
 SYMBOL32-NEXT:     Name: .bss
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x13C
 SYMBOL32-NEXT:     Section: .bss
@@ -97,14 +97,14 @@
 SYMBOL32-NEXT:     StorageClass: C_STAT (0x3)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     Sect Auxiliary Entry For Stat {
-SYMBOL32-NEXT:       Index: 9
+SYMBOL32-NEXT:       Index: [[#INDX+9]]
 SYMBOL32-NEXT:       SectionLength: 4
 SYMBOL32-NEXT:       NumberOfRelocEnt: 0
 SYMBOL32-NEXT:       NumberOfLineNum: 0
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 10
+SYMBOL32-NEXT:     Index: [[#INDX+10]]
 SYMBOL32-NEXT:     Name:
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x0
 SYMBOL32-NEXT:     Section: .text
@@ -112,7 +112,7 @@
 SYMBOL32-NEXT:     StorageClass: C_HIDEXT (0x6B)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 11
+SYMBOL32-NEXT:       Index: [[#INDX+11]]
 SYMBOL32-NEXT:       SectionLen: 256
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -124,7 +124,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 12
+SYMBOL32-NEXT:     Index: [[#INDX+12]]
 SYMBOL32-NEXT:     Name: .fun1
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x0
 SYMBOL32-NEXT:     Section: .text
@@ -132,7 +132,7 @@
 SYMBOL32-NEXT:     StorageClass: C_EXT (0x2)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 13
+SYMBOL32-NEXT:       Index: [[#INDX+13]]
 SYMBOL32-NEXT:       ContainingCsectSymbolIndex: 10
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -144,7 +144,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 14
+SYMBOL32-NEXT:     Index: [[#INDX+14]]
 SYMBOL32-NEXT:     Name: .main
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x60
 SYMBOL32-NEXT:     Section: .text
@@ -152,7 +152,7 @@
 SYMBOL32-NEXT:     StorageClass: C_EXT (0x2)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 15
+SYMBOL32-NEXT:       Index: [[#INDX+15]]
 SYMBOL32-NEXT:       ContainingCsectSymbolIndex: 10
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -164,7 +164,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 16
+SYMBOL32-NEXT:     Index: [[#INDX+16]]
 SYMBOL32-NEXT:     Name: TOC
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x100
 SYMBOL32-NEXT:     Section: .data
@@ -172,7 +172,7 @@
 SYMBOL32-NEXT:     StorageClass: C_HIDEXT (0x6B)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 17
+SYMBOL32-NEXT:       Index: [[#INDX+17]]
 SYMBOL32-NEXT:       SectionLen: 0
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -184,7 +184,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 18
+SYMBOL32-NEXT:     Index: [[#INDX+18]]
 SYMBOL32-NEXT:     Name:
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x114
 SYMBOL32-NEXT:     Section: .data
@@ -192,7 +192,7 @@
 SYMBOL32-NEXT:     StorageClass: C_HIDEXT (0x6B)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 19
+SYMBOL32-NEXT:       Index: [[#INDX+19]]
 SYMBOL32-NEXT:       SectionLen: 4
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -204,7 +204,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 20
+SYMBOL32-NEXT:     Index: [[#INDX+20]]
 SYMBOL32-NEXT:     Name:
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x134
 SYMBOL32-NEXT:     Section: .data
@@ -212,7 +212,7 @@
 SYMBOL32-NEXT:     StorageClass: C_HIDEXT (0x6B)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 21
+SYMBOL32-NEXT:       Index: [[#INDX+21]]
 SYMBOL32-NEXT:       SectionLen: 5
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -224,7 +224,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 22
+SYMBOL32-NEXT:     Index: [[#INDX+22]]
 SYMBOL32-NEXT:     Name: _$STATIC_BSS
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x13C
 SYMBOL32-NEXT:     Section: .bss
@@ -232,7 +232,7 @@
 SYMBOL32-NEXT:     StorageClass: C_HIDEXT (0x6B)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 23
+SYMBOL32-NEXT:       Index: [[#INDX+23]]
 SYMBOL32-NEXT:       SectionLen: 4
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -244,7 +244,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 24
+SYMBOL32-NEXT:     Index: [[#INDX+24]]
 SYMBOL32-NEXT:     Name: _$STATIC_BSS
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x104
 SYMBOL32-NEXT:     Section: .data
@@ -252,7 +252,7 @@
 SYMBOL32-NEXT:     StorageClass: C_HIDEXT (0x6B)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 25
+SYMBOL32-NEXT:       Index: [[#INDX+25]]
 SYMBOL32-NEXT:       SectionLen: 4
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -264,7 +264,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 26
+SYMBOL32-NEXT:     Index: [[#INDX+26]]
 SYMBOL32-NEXT:     Name: fun1
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x118
 SYMBOL32-NEXT:     Section: .data
@@ -272,7 +272,7 @@
 SYMBOL32-NEXT:     StorageClass: C_EXT (0x2)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 27
+SYMBOL32-NEXT:       Index: [[#INDX+27]]
 SYMBOL32-NEXT:       SectionLen: 12
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -284,7 +284,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 28
+SYMBOL32-NEXT:     Index: [[#INDX+28]]
 SYMBOL32-NEXT:     Name: fun1
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x100
 SYMBOL32-NEXT:     Section: .data
@@ -292,7 +292,7 @@
 SYMBOL32-NEXT:     StorageClass: C_HIDEXT (0x6B)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 29
+SYMBOL32-NEXT:       Index: [[#INDX+29]]
 SYMBOL32-NEXT:       SectionLen: 4
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -304,7 +304,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 30
+SYMBOL32-NEXT:     Index: [[#INDX+30]]
 SYMBOL32-NEXT:     Name: p
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x130
 SYMBOL32-NEXT:     Section: .data
@@ -312,7 +312,7 @@
 SYMBOL32-NEXT:     StorageClass: C_EXT (0x2)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 31
+SYMBOL32-NEXT:       Index: [[#INDX+31]]
 SYMBOL32-NEXT:       SectionLen: 4
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -324,7 +324,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 32
+SYMBOL32-NEXT:     Index: [[#INDX+32]]
 SYMBOL32-NEXT:     Name: p
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x108
 SYMBOL32-NEXT:     Section: .data
@@ -332,7 +332,7 @@
 SYMBOL32-NEXT:     StorageClass: C_HIDEXT (0x6B)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 33
+SYMBOL32-NEXT:       Index: [[#INDX+33]]
 SYMBOL32-NEXT:       SectionLen: 4
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -344,7 +344,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 34
+SYMBOL32-NEXT:     Index: [[#INDX+34]]
 SYMBOL32-NEXT:     Name: main
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x124
 SYMBOL32-NEXT:     Section: .data
@@ -352,7 +352,7 @@
 SYMBOL32-NEXT:     StorageClass: C_EXT (0x2)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 35
+SYMBOL32-NEXT:       Index: [[#INDX+35]]
 SYMBOL32-NEXT:       SectionLen: 12
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -364,7 +364,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 36
+SYMBOL32-NEXT:     Index: [[#INDX+36]]
 SYMBOL32-NEXT:     Name: main
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x10C
 SYMBOL32-NEXT:     Section: .data
@@ -372,7 +372,7 @@
 SYMBOL32-NEXT:     StorageClass: C_HIDEXT (0x6B)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 37
+SYMBOL32-NEXT:       Index: [[#INDX+37]]
 SYMBOL32-NEXT:       SectionLen: 4
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -384,7 +384,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 38
+SYMBOL32-NEXT:     Index: [[#INDX+38]]
 SYMBOL32-NEXT:     Name: i
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x0
 SYMBOL32-NEXT:     Section: N_UNDEF
@@ -392,7 +392,7 @@
 SYMBOL32-NEXT:     StorageClass: C_EXT (0x2)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 39
+SYMBOL32-NEXT:       Index: [[#INDX+39]]
 SYMBOL32-NEXT:       SectionLen: 0
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -404,7 +404,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 40
+SYMBOL32-NEXT:     Index: [[#INDX+40]]
 SYMBOL32-NEXT:     Name: i
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x110
 SYMBOL32-NEXT:     Section: .data
@@ -412,7 +412,7 @@
 SYMBOL32-NEXT:     StorageClass: C_HIDEXT (0x6B)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 41
+SYMBOL32-NEXT:       Index: [[#INDX+41]]
 SYMBOL32-NEXT:       SectionLen: 4
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0
@@ -424,7 +424,7 @@
 SYMBOL32-NEXT:     }
 SYMBOL32-NEXT:   }
 SYMBOL32-NEXT:   Symbol {
-SYMBOL32-NEXT:     Index: 42
+SYMBOL32-NEXT:     Index: [[#INDX+42]]
 SYMBOL32-NEXT:     Name: .fun
 SYMBOL32-NEXT:     Value (RelocatableAddress): 0x0
 SYMBOL32-NEXT:     Section: N_UNDEF
@@ -432,7 +432,7 @@
 SYMBOL32-NEXT:     StorageClass: C_EXT (0x2)
 SYMBOL32-NEXT:     NumberOfAuxEntries: 1
 SYMBOL32-NEXT:     CSECT Auxiliary Entry {
-SYMBOL32-NEXT:       Index: 43
+SYMBOL32-NEXT:       Index: [[#INDX+43]]
 SYMBOL32-NEXT:       SectionLen: 0
 SYMBOL32-NEXT:       ParameterHashIndex: 0x0
 SYMBOL32-NEXT:       TypeChkSectNum: 0x0