Index: llvm/trunk/test/Object/obj2yaml.test
===================================================================
--- llvm/trunk/test/Object/obj2yaml.test
+++ llvm/trunk/test/Object/obj2yaml.test
@@ -654,20 +654,20 @@
 WASM-NEXT:     SymbolTable:
 WASM-NEXT:       - Index:           0
 WASM-NEXT:         Kind:            FUNCTION
-WASM-NEXT:         Name:            puts
-WASM-NEXT:         Flags:           [ UNDEFINED ]
-WASM-NEXT:         Function:        0
+WASM-NEXT:         Name:            main
+WASM-NEXT:         Flags:           [  ]
+WASM-NEXT:         Function:        2
 WASM-NEXT:       - Index:           1
-WASM:              Name:            SomeOtherFunction
-WASM:            - Index:           2
-WASM:              Name:            main
-WASM:            - Index:           3
 WASM-NEXT:         Kind:            DATA
 WASM-NEXT:         Name:            .L.str
 WASM-NEXT:         Flags:           [ BINDING_LOCAL ]
 WASM-NEXT:         Segment:         0
-WASM-NEXT:         Size:        13
-WASM-NEXT:       - Index:           4
+WASM-NEXT:         Size:            13
+WASM-NEXT:       - Index:           2
+WASM:              Name:            puts
+WASM:            - Index:           3
+WASM:              Name:            SomeOtherFunction
+WASM:            - Index:           4
 WASM:              Name:            var
 WASM:          SegmentInfo:
 WASM-NEXT:       - Index:           0
Index: llvm/trunk/test/Object/objdump-relocations.test
===================================================================
--- llvm/trunk/test/Object/objdump-relocations.test
+++ llvm/trunk/test/Object/objdump-relocations.test
@@ -60,9 +60,9 @@
 ELF-MIPSEL: R_MIPS_CALL16 SomeOtherFunction
 
 WASM:      CODE
-WASM-NEXT: R_WEBASSEMBLY_MEMORY_ADDR_SLEB 3+0
-WASM-NEXT: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 0+0
-WASM-NEXT: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 1+0
+WASM-NEXT: R_WEBASSEMBLY_MEMORY_ADDR_SLEB 1+0
+WASM-NEXT: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 2+0
+WASM-NEXT: R_WEBASSEMBLY_FUNCTION_INDEX_LEB 3+0
 
 ELF-complex-x86-64: .text
 ELF-complex-x86-64-NEXT: R_X86_64_8 .data-4
Index: llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
===================================================================
--- llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
+++ llvm/trunk/test/tools/llvm-objdump/WebAssembly/symbol-table.test
@@ -1,8 +1,8 @@
 RUN: llvm-objdump -t %p/../Inputs/trivial.obj.wasm | FileCheck %s
 
 CHECK:      SYMBOL TABLE:
-CHECK-NEXT: 00000000 g     F *UND*	puts
-CHECK-NEXT: 00000000 g     F *UND*	SomeOtherFunction
 CHECK-NEXT: 00000002 g     F CODE	main
 CHECK-NEXT: 00000000 l       DATA	.L.str
+CHECK-NEXT: 00000000 g     F *UND*	puts
+CHECK-NEXT: 00000000 g     F *UND*	SomeOtherFunction
 CHECK-NEXT: 00000010 g       DATA	var
Index: llvm/trunk/test/tools/llvm-objdump/wasm.txt
===================================================================
--- llvm/trunk/test/tools/llvm-objdump/wasm.txt
+++ llvm/trunk/test/tools/llvm-objdump/wasm.txt
@@ -8,7 +8,7 @@
 # CHECK-NEXT:  3 CODE          00000019 0000000000000000 TEXT
 # CHECK-NEXT:  4 DATA          0000001c 0000000000000000 DATA
 # CHECK-NEXT:  5 reloc.CODE    00000017 0000000000000000
-# CHECK-NEXT:  6 linking       0000005c 0000000000000000
+# CHECK-NEXT:  6 linking       00000055 0000000000000000
 
 # RUN: llvm-objdump -p %p/Inputs/trivial.obj.wasm | FileCheck %s -check-prefix CHECK-HEADER
 
Index: llvm/trunk/test/tools/llvm-readobj/relocations.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/relocations.test
+++ llvm/trunk/test/tools/llvm-readobj/relocations.test
@@ -291,18 +291,18 @@
 WASM-NEXT:     Relocation {
 WASM-NEXT:       Type: R_WEBASSEMBLY_MEMORY_ADDR_SLEB (4)
 WASM-NEXT:       Offset: 0x4
-WASM-NEXT:       Index: 0x3
+WASM-NEXT:       Index: 0x1
 WASM-NEXT:       Addend: 0
 WASM-NEXT:     }
 WASM-NEXT:     Relocation {
 WASM-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
 WASM-NEXT:       Offset: 0xA
-WASM-NEXT:       Index: 0x0
+WASM-NEXT:       Index: 0x2
 WASM-NEXT:     }
 WASM-NEXT:     Relocation {
 WASM-NEXT:       Type: R_WEBASSEMBLY_FUNCTION_INDEX_LEB (0)
 WASM-NEXT:       Offset: 0x11
-WASM-NEXT:       Index: 0x1
+WASM-NEXT:       Index: 0x3
 WASM-NEXT:     }
 WASM-NEXT:   }
 WASM-NEXT: ]
Index: llvm/trunk/test/tools/llvm-readobj/sections.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/sections.test
+++ llvm/trunk/test/tools/llvm-readobj/sections.test
@@ -534,7 +534,7 @@
 WASM-NEXT:   }
 WASM-NEXT:   Section {
 WASM-NEXT:     Type: CUSTOM (0x0)
-WASM-NEXT:     Size: 72
+WASM-NEXT:     Size: 65
 WASM-NEXT:     Offset: 220
 WASM-NEXT:     Name: linking
 WASM-NEXT:   }
Index: llvm/trunk/test/tools/llvm-readobj/symbols.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/symbols.test
+++ llvm/trunk/test/tools/llvm-readobj/symbols.test
@@ -73,16 +73,6 @@
 
 WASM:      Symbols [
 WASM-NEXT:   Symbol {
-WASM-NEXT:     Name: puts
-WASM-NEXT:     Type: FUNCTION (0x0)
-WASM-NEXT:     Flags: 0x10
-WASM-NEXT:   }
-WASM-NEXT:   Symbol {
-WASM-NEXT:     Name: SomeOtherFunction
-WASM-NEXT:     Type: FUNCTION (0x0)
-WASM-NEXT:     Flags: 0x10
-WASM-NEXT:   }
-WASM-NEXT:   Symbol {
 WASM-NEXT:     Name: main
 WASM-NEXT:     Type: FUNCTION (0x0)
 WASM-NEXT:     Flags: 0x0
@@ -92,4 +82,14 @@
 WASM-NEXT:     Type: DATA (0x1)
 WASM-NEXT:     Flags: 0x2
 WASM-NEXT:   }
+WASM-NEXT:   Symbol {
+WASM-NEXT:     Name: puts
+WASM-NEXT:     Type: FUNCTION (0x0)
+WASM-NEXT:     Flags: 0x10
+WASM-NEXT:   }
+WASM-NEXT:   Symbol {
+WASM-NEXT:     Name: SomeOtherFunction
+WASM-NEXT:     Type: FUNCTION (0x0)
+WASM-NEXT:     Flags: 0x10
+WASM-NEXT:   }
 WASM-NEXT: ]