summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--llvm/test/Object/Inputs/trivial-object-test.wasmbin327 -> 320 bytes
-rw-r--r--llvm/test/Object/obj2yaml.test18
-rw-r--r--llvm/test/Object/objdump-relocations.test6
-rw-r--r--llvm/test/tools/llvm-objdump/Inputs/trivial.obj.wasmbin327 -> 320 bytes
-rw-r--r--llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test4
-rw-r--r--llvm/test/tools/llvm-objdump/wasm.txt2
-rw-r--r--llvm/test/tools/llvm-readobj/Inputs/trivial.obj.wasmbin298 -> 291 bytes
-rw-r--r--llvm/test/tools/llvm-readobj/relocations.test6
-rw-r--r--llvm/test/tools/llvm-readobj/sections.test2
-rw-r--r--llvm/test/tools/llvm-readobj/symbols.test20
10 files changed, 29 insertions, 29 deletions
diff --git a/llvm/test/Object/Inputs/trivial-object-test.wasm b/llvm/test/Object/Inputs/trivial-object-test.wasm
index 9aba700336f..ae1c9876740 100644
--- a/llvm/test/Object/Inputs/trivial-object-test.wasm
+++ b/llvm/test/Object/Inputs/trivial-object-test.wasm
Binary files differ
diff --git a/llvm/test/Object/obj2yaml.test b/llvm/test/Object/obj2yaml.test
index 8b5e4ee4161..235b461ca58 100644
--- a/llvm/test/Object/obj2yaml.test
+++ b/llvm/test/Object/obj2yaml.test
@@ -654,20 +654,20 @@ WASM-NEXT: Name: linking
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
diff --git a/llvm/test/Object/objdump-relocations.test b/llvm/test/Object/objdump-relocations.test
index 4044a299adc..a08fc717aa8 100644
--- a/llvm/test/Object/objdump-relocations.test
+++ b/llvm/test/Object/objdump-relocations.test
@@ -60,9 +60,9 @@ ELF-MIPSEL: R_MIPS_CALL16 puts
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
diff --git a/llvm/test/tools/llvm-objdump/Inputs/trivial.obj.wasm b/llvm/test/tools/llvm-objdump/Inputs/trivial.obj.wasm
index 9aba700336f..ae1c9876740 100644
--- a/llvm/test/tools/llvm-objdump/Inputs/trivial.obj.wasm
+++ b/llvm/test/tools/llvm-objdump/Inputs/trivial.obj.wasm
Binary files differ
diff --git a/llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test b/llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test
index 0dc31e1a629..43c52873c9f 100644
--- a/llvm/test/tools/llvm-objdump/WebAssembly/symbol-table.test
+++ b/llvm/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
diff --git a/llvm/test/tools/llvm-objdump/wasm.txt b/llvm/test/tools/llvm-objdump/wasm.txt
index e31e6371ef1..5b88b63980d 100644
--- a/llvm/test/tools/llvm-objdump/wasm.txt
+++ b/llvm/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
diff --git a/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.wasm b/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.wasm
index b9038c3534f..416e57745c3 100644
--- a/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.wasm
+++ b/llvm/test/tools/llvm-readobj/Inputs/trivial.obj.wasm
Binary files differ
diff --git a/llvm/test/tools/llvm-readobj/relocations.test b/llvm/test/tools/llvm-readobj/relocations.test
index 9d92c2fcb66..dbbbb76d9e8 100644
--- a/llvm/test/tools/llvm-readobj/relocations.test
+++ b/llvm/test/tools/llvm-readobj/relocations.test
@@ -291,18 +291,18 @@ WASM-NEXT: Section (4) CODE {
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: ]
diff --git a/llvm/test/tools/llvm-readobj/sections.test b/llvm/test/tools/llvm-readobj/sections.test
index 7c38b30168a..64f295458a0 100644
--- a/llvm/test/tools/llvm-readobj/sections.test
+++ b/llvm/test/tools/llvm-readobj/sections.test
@@ -534,7 +534,7 @@ WASM-NEXT: Name: reloc.CODE
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: }
diff --git a/llvm/test/tools/llvm-readobj/symbols.test b/llvm/test/tools/llvm-readobj/symbols.test
index 47b04c91382..d6bb870942d 100644
--- a/llvm/test/tools/llvm-readobj/symbols.test
+++ b/llvm/test/tools/llvm-readobj/symbols.test
@@ -73,16 +73,6 @@ ELF-NEXT: }
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: Name: .L.str
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: ]
OpenPOWER on IntegriCloud