diff --git a/lib/MC/WasmObjectWriter.cpp b/lib/MC/WasmObjectWriter.cpp index 3c86ca47e48..87ef0d927ee 100644 --- a/lib/MC/WasmObjectWriter.cpp +++ b/lib/MC/WasmObjectWriter.cpp @@ -1307,9 +1307,9 @@ void WasmObjectWriter::writeObject(MCAssembler &Asm, writeElemSection(TableElems); writeCodeSection(Asm, Layout, Functions); writeDataSection(); + writeLinkingMetaDataSection(SymbolInfos, InitFuncs, Comdats); writeCodeRelocSection(); writeDataRelocSection(); - writeLinkingMetaDataSection(SymbolInfos, InitFuncs, Comdats); // TODO: Translate the .comment section to the output. // TODO: Translate debug sections to the output. diff --git a/test/Object/Inputs/trivial-object-test.wasm b/test/Object/Inputs/trivial-object-test.wasm index ae1c9876740..0c91bf231d9 100644 Binary files a/test/Object/Inputs/trivial-object-test.wasm and b/test/Object/Inputs/trivial-object-test.wasm differ diff --git a/test/tools/llvm-objdump/Inputs/trivial.obj.wasm b/test/tools/llvm-objdump/Inputs/trivial.obj.wasm index ae1c9876740..0c91bf231d9 100644 Binary files a/test/tools/llvm-objdump/Inputs/trivial.obj.wasm and b/test/tools/llvm-objdump/Inputs/trivial.obj.wasm differ diff --git a/test/tools/llvm-objdump/wasm.txt b/test/tools/llvm-objdump/wasm.txt index 5b88b63980d..ef6265c50a6 100644 --- a/test/tools/llvm-objdump/wasm.txt +++ b/test/tools/llvm-objdump/wasm.txt @@ -7,8 +7,8 @@ # CHECK-NEXT: 2 FUNCTION 00000002 0000000000000000 # 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 00000055 0000000000000000 +# CHECK-NEXT: 5 linking 00000055 0000000000000000 +# CHECK-NEXT: 6 reloc.CODE 00000017 0000000000000000 # RUN: llvm-objdump -p %p/Inputs/trivial.obj.wasm | FileCheck %s -check-prefix CHECK-HEADER diff --git a/test/tools/llvm-readobj/Inputs/trivial.obj.wasm b/test/tools/llvm-readobj/Inputs/trivial.obj.wasm index 416e57745c3..326bbc46b6c 100644 Binary files a/test/tools/llvm-readobj/Inputs/trivial.obj.wasm and b/test/tools/llvm-readobj/Inputs/trivial.obj.wasm differ diff --git a/test/tools/llvm-readobj/sections.test b/test/tools/llvm-readobj/sections.test index 64f295458a0..a243b7c5376 100644 --- a/test/tools/llvm-readobj/sections.test +++ b/test/tools/llvm-readobj/sections.test @@ -528,14 +528,14 @@ WASM-NEXT: ] WASM-NEXT: } WASM-NEXT: Section { WASM-NEXT: Type: CUSTOM (0x0) -WASM-NEXT: Size: 23 +WASM-NEXT: Size: 65 WASM-NEXT: Offset: 191 -WASM-NEXT: Name: reloc.CODE +WASM-NEXT: Name: linking WASM-NEXT: } WASM-NEXT: Section { WASM-NEXT: Type: CUSTOM (0x0) -WASM-NEXT: Size: 65 -WASM-NEXT: Offset: 220 -WASM-NEXT: Name: linking +WASM-NEXT: Size: 23 +WASM-NEXT: Offset: 262 +WASM-NEXT: Name: reloc.CODE WASM-NEXT: } WASM-NEXT: ]