# RUN: llvm-readelf -x .rodata %t | FileCheck --check-prefix=SAME %s --implicit-check-not=section
# SAME: section '.rodata':
-# SAME-NEXT: 0x00000000 01000200 0300
+# SAME-NEXT: 0x00000000 03000100 0200
## SHF_MERGE sections with different output sections cannot be merged.
# RUN: echo 'SECTIONS { \
# RUN: llvm-readelf -x .rodata.foo -x .rodata.bar %t2 | FileCheck --check-prefix=DIFF %s --implicit-check-not=section
# DIFF: section '.rodata.foo':
-# DIFF-NEXT: 0x00000000 01000200 0300
+# DIFF-NEXT: 0x00000000 03000100 0200
# DIFF: section '.rodata.bar':
# DIFF-NEXT: 0x00000006 0100
# SEC: Name Type {{.*}} Size ES Flg Lk Inf Al
# SEC: .cst8 PROGBITS {{.*}} 000018 08 AM 0 0 8
-# CHECK: 0x{{[0-9a-f]+}} 02000000 00000000 01000000 00000000
-# CHECK-NEXT: 0x{{[0-9a-f]+}} 03000000 00000000
+# CHECK: [[#%x,]] 01000000 00000000 02000000 00000000
+# CHECK-NEXT: [[#%x,]] 03000000 00000000
.section .cst8,"aM",@progbits,8,unique,0
.align 4
# SEC: .cst PROGBITS {{.*}} 000020 00 AM 0 0 8
# HEX: Hex dump of section '.cst':
-# HEX-NEXT: 0x{{[0-9a-f]+}} 01000000 00000000 02000000 00000000
-# HEX-NEXT: 0x{{[0-9a-f]+}} 01000000 00000000 03000000 00000000
+# HEX-NEXT: [[#%x,]] 00000000 02000000 01000000 00000000
+# HEX-NEXT: [[#%x,]] 01000000 00000000 03000000 00000000
.section .cst,"aM",@progbits,4,unique,0
.align 2
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/merge.s -o %t2.o
// RUN: ld.lld %t.o %t2.o -o %t
// RUN: llvm-readelf -S -s -x .mysec %t | FileCheck %s
-// RUN: llvm-objdump --no-print-imm-hex -d %t | FileCheck --check-prefix=DISASM %s
+// RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
// CHECK: Name Type Address Off Size ES Flg Lk Inf Al
// CHECK: .mysec PROGBITS 0000000000200120 000120 000008 04 AM 0 0 4
-// CHECK-DAG: 0000000000200124 0 NOTYPE LOCAL DEFAULT 1 bar
-// CHECK-DAG: 0000000000200124 0 NOTYPE LOCAL DEFAULT 1 zed
-// CHECK-DAG: 0000000000200124 0 NOTYPE LOCAL HIDDEN 1 foo
+// CHECK-DAG: 0000000000200120 0 NOTYPE LOCAL DEFAULT 1 bar
+// CHECK-DAG: 0000000000200120 0 NOTYPE LOCAL DEFAULT 1 zed
+// CHECK-DAG: 0000000000200120 0 NOTYPE LOCAL HIDDEN 1 foo
// CHECK: Hex dump of section '.mysec':
-// CHECK-NEXT: 0x00200120 10000000 42000000
+// CHECK-NEXT: 0x00200120 42000000 10000000
.section .mysec,"aM",@progbits,4
.align 4
// DISASM-NEXT: <_start>:
movl .mysec, %eax
-// addr(0x10) = 2097440
-// DISASM-NEXT: movl 2097440, %eax
+// addr(0x10)
+// DISASM-NEXT: movl 0x200124, %eax
movl .mysec+7, %eax
-// addr(0x42) + 3 = 2097444 + 3 = 2097447
-// DISASM-NEXT: movl 2097447, %eax
+// addr(0x42) + 3
+// DISASM-NEXT: movl 0x200123, %eax
movl .mysec+8, %eax
-// addr(0x42) = 2097444
-// DISASM-NEXT: movl 2097444, %eax
+// addr(0x42)
+// DISASM-NEXT: movl 0x200120, %eax
movl bar+7, %eax
-// addr(0x42) + 7 = 2097444 + 7 = 2097451
-// DISASM-NEXT: movl 2097451, %eax
+// addr(0x42) + 3
+// DISASM-NEXT: movl 0x200127, %eax
movl bar+8, %eax
-// addr(0x42) + 8 = 2097444 + 8 = 2097452
-// DISASM-NEXT: movl 2097452, %eax
+// addr(0x42)
+// DISASM-NEXT: movl 0x200128, %eax
movl foo, %eax
-// addr(0x42) = 2097444
-// DISASM-NEXT: movl 2097444, %eax
+// addr(0x42)
+// DISASM-NEXT: movl 0x200120, %eax
movl foo+7, %eax
-// addr(0x42) + 7 = = 2097444 + 7 = 2097451
-// DISASM-NEXT: movl 2097451, %eax
+// addr(0x42) + 7
+// DISASM-NEXT: movl 0x200127, %eax
movl foo+8, %eax
-// addr(0x42) + 8 = = 2097444 + 8 = 2097452
-// DISASM-NEXT: movl 2097452, %eax
+// addr(0x42) + 8
+// DISASM-NEXT: movl 0x200128, %eax
// From the other file: movl .mysec, %eax
-// addr(0x42) = 2097444
-// DISASM-NEXT: movl 2097444, %eax
+// addr(0x42)
+// DISASM-NEXT: movl 0x200120, %eax