Index: ELF/Target.h =================================================================== --- ELF/Target.h +++ ELF/Target.h @@ -64,13 +64,12 @@ unsigned PageSize = 4096; unsigned MaxPageSize = 4096; - // On freebsd x86_64 the first page cannot be mmaped. - // On linux that is controled by vm.mmap_min_addr. At least on some x86_64 - // installs that is 65536, so the first 15 pages cannot be used. - // Given that, the smallest value that can be used in here is 0x10000. - // If using 2MB pages, the smallest page aligned address that works is - // 0x200000, but it looks like every OS uses 4k pages for executables. - uint64_t DefaultImageBase = 0x10000; + // Align to the least common multiple of the large page size (known as a + // superpage or huge page) available on common platforms. Non-PAE x86 + // supports 4MB pages and x86-64 and arm64 support 2MB pages. FreeBSD + // automatically promotes large, superpage-aligned allocations, and this + // default image base address is consistent with GNU ld and gold. + uint64_t DefaultImageBase = 0x400000; uint32_t CopyRel; uint32_t GotRel; Index: test/ELF/Inputs/wrap.s =================================================================== --- test/ELF/Inputs/wrap.s +++ test/ELF/Inputs/wrap.s @@ -1,4 +1,4 @@ .globl foo, __wrap_foo, __real_foo -foo = 0x11000 -__wrap_foo = 0x11010 -__real_foo = 0x11020 +foo = 0x401000 +__wrap_foo = 0x401010 +__real_foo = 0x401020 Index: test/ELF/aarch64-abs16.s =================================================================== --- test/ELF/aarch64-abs16.s +++ test/ELF/aarch64-abs16.s @@ -14,11 +14,11 @@ // RUN: llvm-objdump -s -section=.data %t2 | FileCheck %s // CHECK: Contents of section .data: -// 11000: S = 0x100, A = 0xfeff +// 401000: S = 0x100, A = 0xfeff // S + A = 0xffff -// 11002: S = 0x100, A = -0x8100 +// 401002: S = 0x100, A = -0x8100 // S + A = 0x8000 -// CHECK-NEXT: 20000 ffff0080 +// CHECK-NEXT: 410000 ffff0080 // RUN: not ld.lld %t.o %t255.o -o %t2 // | FileCheck %s --check-prefix=OVERFLOW Index: test/ELF/aarch64-abs32.s =================================================================== --- test/ELF/aarch64-abs32.s +++ test/ELF/aarch64-abs32.s @@ -14,11 +14,11 @@ // RUN: llvm-objdump -s -section=.data %t2 | FileCheck %s // CHECK: Contents of section .data: -// 20000: S = 0x100, A = 0xfffffeff +// 400000: S = 0x100, A = 0xfffffeff // S + A = 0xffffffff -// 20004: S = 0x100, A = -0x80000100 +// 400004: S = 0x100, A = -0x80000100 // S + A = 0x80000000 -// CHECK-NEXT: 20000 ffffffff 00000080 +// CHECK-NEXT: 410000 ffffffff 00000080 // RUN: not ld.lld %t.o %t255.o -o %t2 // | FileCheck %s --check-prefix=OVERFLOW Index: test/ELF/aarch64-condb-reloc.s =================================================================== --- test/ELF/aarch64-condb-reloc.s +++ test/ELF/aarch64-condb-reloc.s @@ -7,26 +7,26 @@ # RUN: llvm-readobj -s -r %t3 | FileCheck -check-prefix=DSOREL %s # REQUIRES: aarch64 -# 0x11024 - 36 = 0x11000 -# 0x11028 - 24 = 0x11010 -# 0x1102c - 16 = 0x1101c +# 0x401024 - 36 = 0x401000 +# 0x401028 - 24 = 0x401010 +# 0x40102c - 16 = 0x40101c # CHECK: Disassembly of section .text: # CHECK-NEXT: _foo: -# CHECK-NEXT: 20000: {{.*}} nop -# CHECK-NEXT: 20004: {{.*}} nop -# CHECK-NEXT: 20008: {{.*}} nop -# CHECK-NEXT: 2000c: {{.*}} nop +# CHECK-NEXT: 410000: {{.*}} nop +# CHECK-NEXT: 410004: {{.*}} nop +# CHECK-NEXT: 410008: {{.*}} nop +# CHECK-NEXT: 41000c: {{.*}} nop # CHECK: _bar: -# CHECK-NEXT: 20010: {{.*}} nop -# CHECK-NEXT: 20014: {{.*}} nop -# CHECK-NEXT: 20018: {{.*}} nop +# CHECK-NEXT: 410010: {{.*}} nop +# CHECK-NEXT: 410014: {{.*}} nop +# CHECK-NEXT: 410018: {{.*}} nop # CHECK: _dah: -# CHECK-NEXT: 2001c: {{.*}} nop -# CHECK-NEXT: 20020: {{.*}} nop +# CHECK-NEXT: 41001c: {{.*}} nop +# CHECK-NEXT: 410020: {{.*}} nop # CHECK: _start: -# CHECK-NEXT: 20024: {{.*}} b.eq #-36 -# CHECK-NEXT: 20028: {{.*}} b.eq #-24 -# CHECK-NEXT: 2002c: {{.*}} b.eq #-16 +# CHECK-NEXT: 410024: {{.*}} b.eq #-36 +# CHECK-NEXT: 410028: {{.*}} b.eq #-24 +# CHECK-NEXT: 41002c: {{.*}} b.eq #-16 #DSOREL: Section { #DSOREL: Index: Index: test/ELF/aarch64-copy.s =================================================================== --- test/ELF/aarch64-copy.s +++ test/ELF/aarch64-copy.s @@ -22,7 +22,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x40000 +// CHECK-NEXT: Address: 0x43000 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 24 // CHECK-NEXT: Link: @@ -32,19 +32,19 @@ // CHECK: Relocations [ // CHECK-NEXT: Section ({{.*}}) .rela.dyn { // CHECK-NEXT: Relocation { -// CHECK-NEXT: Offset: 0x40000 +// CHECK-NEXT: Offset: 0x430000 // CHECK-NEXT: Type: R_AARCH64_COPY // CHECK-NEXT: Symbol: x // CHECK-NEXT: Addend: 0x0 // CHECK-NEXT: } // CHECK-NEXT: Relocation { -// CHECK-NEXT: Offset: 0x40010 +// CHECK-NEXT: Offset: 0x430010 // CHECK-NEXT: Type: R_AARCH64_COPY // CHECK-NEXT: Symbol: y // CHECK-NEXT: Addend: 0x0 // CHECK-NEXT: } // CHECK-NEXT: Relocation { -// CHECK-NEXT: Offset: 0x40014 +// CHECK-NEXT: Offset: 0x430014 // CHECK-NEXT: Type: R_AARCH64_COPY // CHECK-NEXT: Symbol: z // CHECK-NEXT: Addend: 0x0 @@ -54,21 +54,21 @@ // CHECK: Symbols [ // CHECK: Name: x -// CHECK-NEXT: Value: 0x40000 +// CHECK-NEXT: Value: 0x430000 // CHECK-NEXT: Size: 4 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object // CHECK-NEXT: Other: // CHECK-NEXT: Section: .bss // CHECK: Name: y -// CHECK-NEXT: Value: 0x40010 +// CHECK-NEXT: Value: 0x430010 // CHECK-NEXT: Size: 4 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object // CHECK-NEXT: Other: // CHECK-NEXT: Section: .bss // CHECK: Name: z -// CHECK-NEXT: Value: 0x40014 +// CHECK-NEXT: Value: 0x430014 // CHECK-NEXT: Size: 4 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object @@ -80,14 +80,14 @@ // CODE-NEXT: _start: // S(x) = 0x40000, A = 0, P = 0x20000 // S + A - P = 0x20000 = 131072 -// CODE-NEXT: 20000: {{.*}} adr x1, #131072 +// CODE-NEXT: 410000: {{.*}} adr x1, #131072 // S(y) = 0x40010, A = 0, P = 0x20004 // Page(S + A) - Page(P) = 0x40000 - 0x20000 = 0x20000 = 131072 -// CODE-NEXT: 20004: {{.*}} adrp x2, #131072 +// CODE-NEXT: 410004: {{.*}} adrp x2, #131072 // S(y) = 0x40010, A = 0 // (S + A) & 0xFFF = 0x10 = 16 -// CODE-NEXT: 20008: {{.*}} add x2, x2, #16 +// CODE-NEXT: 410008: {{.*}} add x2, x2, #16 // RODATA: Contents of section .rodata: // S(z) = 0x40014 -// RODATA-NEXT: 101c8 14000400 +// RODATA-NEXT: 4001c8 14004300 Index: test/ELF/aarch64-copy2.s =================================================================== --- test/ELF/aarch64-copy2.s +++ test/ELF/aarch64-copy2.s @@ -19,7 +19,7 @@ // CHECK-NEXT: Section: Undefined // CHECK: Name: foo -// CHECK-NEXT: Value: 0x20030 +// CHECK-NEXT: Value: 0x410030 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Function Index: test/ELF/aarch64-data-relocs.s =================================================================== --- test/ELF/aarch64-data-relocs.s +++ test/ELF/aarch64-data-relocs.s @@ -12,7 +12,7 @@ // S = 0x100, A = 0x24 // S + A = 0x124 // CHECK: Contents of section .R_AARCH64_ABS64: -// CHECK-NEXT: 20000 24010000 00000000 +// CHECK-NEXT: 410000 24010000 00000000 .section .R_AARCH64_PREL64, "ax",@progbits .xword foo - . + 0x24 @@ -20,4 +20,4 @@ // S = 0x100, A = 0x24, P = 0x20008 // S + A - P = 0xfffffffffffe011c // CHECK: Contents of section .R_AARCH64_PREL64: -// CHECK-NEXT: 20008 1c01feff ffffffff +// CHECK-NEXT: 410008 1c01bfff ffffffff Index: test/ELF/aarch64-gnu-ifunc.s =================================================================== --- test/ELF/aarch64-gnu-ifunc.s +++ test/ELF/aarch64-gnu-ifunc.s @@ -22,8 +22,8 @@ // CHECK-NEXT: } // CHECK: Relocations [ // CHECK-NEXT: Section ({{.*}}) .rela.plt { -// CHECK-NEXT: 0x30018 R_AARCH64_IRELATIVE -// CHECK-NEXT: 0x30020 R_AARCH64_IRELATIVE +// CHECK-NEXT: 0x420018 R_AARCH64_IRELATIVE +// CHECK-NEXT: 0x420020 R_AARCH64_IRELATIVE // CHECK-NEXT: } // CHECK-NEXT: ] // CHECK: Symbols [ @@ -38,7 +38,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: $x.0 -// CHECK-NEXT: Value: 0x20000 +// CHECK-NEXT: Value: 0x410000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -47,7 +47,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: __rela_iplt_end -// CHECK-NEXT: Value: 0x10188 +// CHECK-NEXT: Value: 0x400188 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -58,7 +58,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: __rela_iplt_start -// CHECK-NEXT: Value: 0x10158 +// CHECK-NEXT: Value: 0x400158 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -69,7 +69,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _start -// CHECK-NEXT: Value: 0x20008 +// CHECK-NEXT: Value: 0x410008 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None @@ -78,7 +78,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: bar -// CHECK-NEXT: Value: 0x20004 +// CHECK-NEXT: Value: 0x410004 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: GNU_IFunc @@ -87,7 +87,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: foo -// CHECK-NEXT: Value: 0x20000 +// CHECK-NEXT: Value: 0x410000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: GNU_IFunc @@ -100,32 +100,32 @@ // 392 = 0x188 // DISASM: Disassembly of section .text: // DISASM-NEXT: foo: -// DISASM-NEXT: 20000: c0 03 5f d6 ret +// DISASM-NEXT: 410000: c0 03 5f d6 ret // DISASM: bar: -// DISASM-NEXT: 20004: c0 03 5f d6 ret +// DISASM-NEXT: 410004: c0 03 5f d6 ret // DISASM: _start: -// DISASM-NEXT: 20008: 0e 00 00 94 bl #56 -// DISASM-NEXT: 2000c: 11 00 00 94 bl #68 -// DISASM-NEXT: 20010: 42 60 05 91 add x2, x2, #344 -// DISASM-NEXT: 20014: 42 20 06 91 add x2, x2, #392 +// DISASM-NEXT: 410008: 0e 00 00 94 bl #56 +// DISASM-NEXT: 41000c: 11 00 00 94 bl #68 +// DISASM-NEXT: 410010: 42 60 05 91 add x2, x2, #344 +// DISASM-NEXT: 410014: 42 20 06 91 add x2, x2, #392 // DISASM-NEXT: Disassembly of section .plt: // DISASM-NEXT: .plt: -// DISASM-NEXT: 20020: f0 7b bf a9 stp x16, x30, [sp, #-16]! -// DISASM-NEXT: 20024: 90 00 00 90 adrp x16, #65536 -// DISASM-NEXT: 20028: 11 0a 40 f9 ldr x17, [x16, #16] -// DISASM-NEXT: 2002c: 10 42 00 91 add x16, x16, #16 -// DISASM-NEXT: 20030: 20 02 1f d6 br x17 -// DISASM-NEXT: 20034: 1f 20 03 d5 nop -// DISASM-NEXT: 20038: 1f 20 03 d5 nop -// DISASM-NEXT: 2003c: 1f 20 03 d5 nop -// DISASM-NEXT: 20040: 90 00 00 90 adrp x16, #65536 -// DISASM-NEXT: 20044: 11 0e 40 f9 ldr x17, [x16, #24] -// DISASM-NEXT: 20048: 10 62 00 91 add x16, x16, #24 -// DISASM-NEXT: 2004c: 20 02 1f d6 br x17 -// DISASM-NEXT: 20050: 90 00 00 90 adrp x16, #65536 -// DISASM-NEXT: 20054: 11 12 40 f9 ldr x17, [x16, #32] -// DISASM-NEXT: 20058: 10 82 00 91 add x16, x16, #32 -// DISASM-NEXT: 2005c: 20 02 1f d6 br x17 +// DISASM-NEXT: 410020: f0 7b bf a9 stp x16, x30, [sp, #-16]! +// DISASM-NEXT: 410024: 90 00 00 90 adrp x16, #65536 +// DISASM-NEXT: 410028: 11 0a 40 f9 ldr x17, [x16, #16] +// DISASM-NEXT: 41002c: 10 42 00 91 add x16, x16, #16 +// DISASM-NEXT: 410030: 20 02 1f d6 br x17 +// DISASM-NEXT: 410034: 1f 20 03 d5 nop +// DISASM-NEXT: 410038: 1f 20 03 d5 nop +// DISASM-NEXT: 41003c: 1f 20 03 d5 nop +// DISASM-NEXT: 410040: 90 00 00 90 adrp x16, #65536 +// DISASM-NEXT: 410044: 11 0e 40 f9 ldr x17, [x16, #24] +// DISASM-NEXT: 410048: 10 62 00 91 add x16, x16, #24 +// DISASM-NEXT: 41004c: 20 02 1f d6 br x17 +// DISASM-NEXT: 410050: 90 00 00 90 adrp x16, #65536 +// DISASM-NEXT: 410054: 11 12 40 f9 ldr x17, [x16, #32] +// DISASM-NEXT: 410058: 10 82 00 91 add x16, x16, #32 +// DISASM-NEXT: 41005c: 20 02 1f d6 br x17 .text .type foo STT_GNU_IFUNC Index: test/ELF/aarch64-prel16.s =================================================================== --- test/ELF/aarch64-prel16.s +++ test/ELF/aarch64-prel16.s @@ -7,8 +7,8 @@ .globl _start _start: .data - .hword foo - . + 0x20eff - .hword foo - . + 0x8f02 + .hword foo - . + 0x410eff + .hword foo - . + 0x3f8f02 // Note: If this test fails, it probably happens because of // the change of the address of the .data section. @@ -18,11 +18,11 @@ // RUN: llvm-objdump -s -section=.data %t2 | FileCheck %s // CHECK: Contents of section .data: -// 11000: S = 0x100, A = 0x20eff, P = 0x11000 +// 401000: S = 0x100, A = 0x20eff, P = 0x401000 // S + A - P = 0xffff -// 11002: S = 0x100, A = 0x8f02, P = 0x11002 +// 401002: S = 0x100, A = 0x8f02, P = 0x401002 // S + A - P = 0x8000 -// CHECK-NEXT: 11000 ffff0080 +// CHECK-NEXT: 401000 ffff0080 // RUN: not ld.lld %t.o %t255.o -o %t2 // | FileCheck %s --check-prefix=OVERFLOW Index: test/ELF/aarch64-prel32.s =================================================================== --- test/ELF/aarch64-prel32.s +++ test/ELF/aarch64-prel32.s @@ -7,8 +7,8 @@ .globl _start _start: .data - .word foo - . + 0x100010eff - .word foo - . - 0x7ffef0fc + .word foo - . + 0x100400eff + .word foo - . - 0x803df0fc // Note: If this test fails, it probably happens because of // the change of the address of the .data section. @@ -18,11 +18,11 @@ // RUN: llvm-objdump -s -section=.data %t2 | FileCheck %s // CHECK: Contents of section .data: -// 11000: S = 0x100, A = 0x100010eff, P = 0x11000 +// 401000: S = 0x100, A = 0x100010eff, P = 0x401000 // S + A - P = 0xffffffff -// 11004: S = 0x100, A = -0x7ffef0fc, P = 0x11004 +// 401004: S = 0x100, A = -0x7ffef0fc, P = 0x401004 // S + A - P = 0x80000000 -// CHECK-NEXT: 11000 ffffffff 00000080 +// CHECK-NEXT: 401000 ffffffff 00000080 // RUN: not ld.lld %t.o %t255.o -o %t2 // | FileCheck %s --check-prefix=OVERFLOW Index: test/ELF/aarch64-relocs.s =================================================================== --- test/ELF/aarch64-relocs.s +++ test/ELF/aarch64-relocs.s @@ -25,12 +25,12 @@ .size mystr, 4 # S = 0x20012, A = 0x4, P = 0x20012 -# PAGE(S + A) = 0x11000 -# PAGE(P) = 0x11000 +# PAGE(S + A) = 0x401000 +# PAGE(P) = 0x401000 # # CHECK: Disassembly of section .R_AARCH64_ADR_PREL_PG_H121: # CHECK-NEXT: $x.2: -# CHECK-NEXT: 20012: 01 00 00 90 adrp x1, #0 +# CHECK-NEXT: 410012: 01 00 00 90 adrp x1, #0 .section .R_AARCH64_ADD_ABS_LO12_NC,"ax",@progbits add x0, x0, :lo12:.L.str @@ -44,7 +44,7 @@ # # CHECK: Disassembly of section .R_AARCH64_ADD_ABS_LO12_NC: # CHECK-NEXT: $x.4: -# CHECK-NEXT: 2001b: 00 7c 00 91 add x0, x0, #31 +# CHECK-NEXT: 41001b: 00 7c 00 91 add x0, x0, #31 .section .R_AARCH64_LDST64_ABS_LO12_NC,"ax",@progbits ldr x28, [x27, :lo12:foo] @@ -57,7 +57,7 @@ # 0x00001400 | 0xf940177c = 0xf940177c # CHECK: Disassembly of section .R_AARCH64_LDST64_ABS_LO12_NC: # CHECK-NEXT: $x.6: -# CHECK-NEXT: 20024: 7c 17 40 f9 ldr x28, [x27, #40] +# CHECK-NEXT: 410024: 7c 17 40 f9 ldr x28, [x27, #40] .section .SUB,"ax",@progbits nop @@ -66,9 +66,9 @@ # CHECK: Disassembly of section .SUB: # CHECK-NEXT: $x.8: -# CHECK-NEXT: 2002c: 1f 20 03 d5 nop +# CHECK-NEXT: 41002c: 1f 20 03 d5 nop # CHECK: sub: -# CHECK-NEXT: 20030: 1f 20 03 d5 nop +# CHECK-NEXT: 410030: 1f 20 03 d5 nop .section .R_AARCH64_CALL26,"ax",@progbits call26: @@ -80,7 +80,7 @@ # 0x94000000 | 0x03ffffff = 0x97ffffff # CHECK: Disassembly of section .R_AARCH64_CALL26: # CHECK-NEXT: call26: -# CHECK-NEXT: 20034: ff ff ff 97 bl #-4 +# CHECK-NEXT: 410034: ff ff ff 97 bl #-4 .section .R_AARCH64_JUMP26,"ax",@progbits jump26: @@ -92,7 +92,7 @@ # 0x14000000 | 0x03fffffe = 0x17fffffe # CHECK: Disassembly of section .R_AARCH64_JUMP26: # CHECK-NEXT: jump26: -# CHECK-NEXT: 20038: fe ff ff 17 b #-8 +# CHECK-NEXT: 410038: fe ff ff 17 b #-8 .section .R_AARCH64_LDST32_ABS_LO12_NC,"ax",@progbits ldst32: @@ -106,7 +106,7 @@ # 0x00004000 | 0xbd4000a4 = 0xbd4040a4 # CHECK: Disassembly of section .R_AARCH64_LDST32_ABS_LO12_NC: # CHECK-NEXT: ldst32: -# CHECK-NEXT: 2003c: a4 40 40 bd ldr s4, [x5, #64] +# CHECK-NEXT: 41003c: a4 40 40 bd ldr s4, [x5, #64] .section .R_AARCH64_LDST8_ABS_LO12_NC,"ax",@progbits ldst8: @@ -120,7 +120,7 @@ # 0x00012000 | 0x398001ab = 0x398121ab # CHECK: Disassembly of section .R_AARCH64_LDST8_ABS_LO12_NC: # CHECK-NEXT: ldst8: -# CHECK-NEXT: 20044: ab 21 81 39 ldrsb x11, [x13, #72] +# CHECK-NEXT: 410044: ab 21 81 39 ldrsb x11, [x13, #72] .section .R_AARCH64_LDST128_ABS_LO12_NC,"ax",@progbits ldst128: @@ -134,9 +134,9 @@ # 0x00001400 | 0x3dc00274 = 0x3dc01674 # CHECK: Disassembly of section .R_AARCH64_LDST128_ABS_LO12_NC: # CHECK: ldst128: -# CHECK: 2004c: 74 16 c0 3d ldr q20, [x19, #80] +# CHECK: 41004c: 74 16 c0 3d ldr q20, [x19, #80] #foo128: -# 20050: 66 6f 6f 00 .word +# 410050: 66 6f 6f 00 .word .section .R_AARCH64_LDST16_ABS_LO12_NC,"ax",@progbits ldst16: @@ -150,7 +150,7 @@ # 0xb000 | 0x7d400271 = 0x7d40b271 # CHECK: Disassembly of section .R_AARCH64_LDST16_ABS_LO12_NC: # CHECK-NEXT: ldst16: -# CHECK-NEXT: 20054: 71 b2 40 7d ldr h17, [x19, #88] +# CHECK-NEXT: 410054: 71 b2 40 7d ldr h17, [x19, #88] .section .R_AARCH64_MOVW_UABS,"ax",@progbits movz1: Index: test/ELF/aarch64-tls-gdie.s =================================================================== --- test/ELF/aarch64-tls-gdie.s +++ test/ELF/aarch64-tls-gdie.s @@ -21,14 +21,14 @@ // SEC-NEXT: SHF_ALLOC // SEC-NEXT: SHF_WRITE // SEC-NEXT: ] -// SEC-NEXT: Address: 0x300B0 +// SEC-NEXT: Address: 0x4200B0 -// page(0x300B0) - page(0x20004) = 65536 +// page(0x4200B0) - page(0x410004) = 65536 // 0x0B0 = 176 // CHECK: _start: -// CHECK-NEXT: 20000: {{.*}} nop -// CHECK-NEXT: 20004: {{.*}} adrp x0, #65536 -// CHECK-NEXT: 20008: {{.*}} ldr x0, [x0, #176] -// CHECK-NEXT: 2000c: {{.*}} nop -// CHECK-NEXT: 20010: {{.*}} nop +// CHECK-NEXT: 410000: {{.*}} nop +// CHECK-NEXT: 410004: {{.*}} adrp x0, #65536 +// CHECK-NEXT: 410008: {{.*}} ldr x0, [x0, #176] +// CHECK-NEXT: 41000c: {{.*}} nop +// CHECK-NEXT: 410010: {{.*}} nop Index: test/ELF/aarch64-tls-gdle.s =================================================================== --- test/ELF/aarch64-tls-gdle.s +++ test/ELF/aarch64-tls-gdle.s @@ -12,10 +12,10 @@ # TCB size = 0x16 and foo is first element from TLS register. # CHECK: Disassembly of section .text: # CHECK: _start: -# CHECK: 20000: 00 00 a0 d2 movz x0, #0, lsl #16 -# CHECK: 20004: 00 02 80 f2 movk x0, #16 -# CHECK: 20008: 1f 20 03 d5 nop -# CHECK: 2000c: 1f 20 03 d5 nop +# CHECK: 410000: 00 00 a0 d2 movz x0, #0, lsl #16 +# CHECK: 410004: 00 02 80 f2 movk x0, #16 +# CHECK: 410008: 1f 20 03 d5 nop +# CHECK: 41000c: 1f 20 03 d5 nop .globl _start _start: Index: test/ELF/aarch64-tls-ie.s =================================================================== --- test/ELF/aarch64-tls-ie.s +++ test/ELF/aarch64-tls-ie.s @@ -15,7 +15,7 @@ #RELOC-NEXT: SHF_ALLOC #RELOC-NEXT: SHF_WRITE #RELOC-NEXT: ] -#RELOC-NEXT: Address: 0x300B0 +#RELOC-NEXT: Address: 0x4200B0 #RELOC-NEXT: Offset: 0x200B0 #RELOC-NEXT: Size: 16 #RELOC-NEXT: Link: 0 @@ -25,21 +25,21 @@ #RELOC-NEXT: } #RELOC: Relocations [ #RELOC-NEXT: Section ({{.*}}) .rela.dyn { -#RELOC-NEXT: 0x300B8 R_AARCH64_TLS_TPREL64 bar 0x0 -#RELOC-NEXT: 0x300B0 R_AARCH64_TLS_TPREL64 foo 0x0 +#RELOC-NEXT: 0x4200B8 R_AARCH64_TLS_TPREL64 bar 0x0 +#RELOC-NEXT: 0x4200B0 R_AARCH64_TLS_TPREL64 foo 0x0 #RELOC-NEXT: } #RELOC-NEXT:] -# Page(0x300B0) - Page(0x20000) = 0x10000 = 65536 +# Page(0x4200B0) - Page(0x410000) = 0x400000 = 65536 # 0x300B0 & 0xff8 = 0xB0 = 176 -# Page(0x300B8) - Page(0x20000) = 0x10000 = 65536 +# Page(0x4200B8) - Page(0x410000) = 0x400000 = 65536 # 0x300B8 & 0xff8 = 0xB8 = 184 #CHECK: Disassembly of section .text: #CHECK: _start: -#CHECK: 20000: 80 00 00 90 adrp x0, #65536 -#CHECK: 20004: 00 58 40 f9 ldr x0, [x0, #176] -#CHECK: 20008: 80 00 00 90 adrp x0, #65536 -#CHECK: 2000c: 00 5c 40 f9 ldr x0, [x0, #184] +#CHECK: 410000: 80 00 00 90 adrp x0, #65536 +#CHECK: 410004: 00 58 40 f9 ldr x0, [x0, #176] +#CHECK: 410008: 80 00 00 90 adrp x0, #65536 +#CHECK: 41000c: 00 5c 40 f9 ldr x0, [x0, #184] .globl _start _start: Index: test/ELF/aarch64-tls-iele.s =================================================================== --- test/ELF/aarch64-tls-iele.s +++ test/ELF/aarch64-tls-iele.s @@ -12,10 +12,10 @@ # TCB size = 0x16 and foo is first element from TLS register. # CHECK: Disassembly of section .text: # CHECK: _start: -# CHECK-NEXT: 20000: 00 00 a0 d2 movz x0, #0, lsl #16 -# CHECK-NEXT: 20004: 80 02 80 f2 movk x0, #20 -# CHECK-NEXT: 20008: 00 00 a0 d2 movz x0, #0, lsl #16 -# CHECK-NEXT: 2000c: 00 02 80 f2 movk x0, #16 +# CHECK-NEXT: 410000: 00 00 a0 d2 movz x0, #0, lsl #16 +# CHECK-NEXT: 410004: 80 02 80 f2 movk x0, #20 +# CHECK-NEXT: 410008: 00 00 a0 d2 movz x0, #0, lsl #16 +# CHECK-NEXT: 41000c: 00 02 80 f2 movk x0, #16 .section .tdata .align 2 Index: test/ELF/aarch64-tls-le.s =================================================================== --- test/ELF/aarch64-tls-le.s +++ test/ELF/aarch64-tls-le.s @@ -17,9 +17,9 @@ # TCB size = 0x16 and foo is first element from TLS register. #CHECK: Disassembly of section .text: #CHECK: _start: -#CHECK: 20000: 40 d0 3b d5 mrs x0, TPIDR_EL0 -#CHECK: 20004: 00 00 40 91 add x0, x0, #0, lsl #12 -#CHECK: 20008: 00 40 00 91 add x0, x0, #16 +#CHECK: 410000: 40 d0 3b d5 mrs x0, TPIDR_EL0 +#CHECK: 410004: 00 00 40 91 add x0, x0, #0, lsl #12 +#CHECK: 410008: 00 40 00 91 add x0, x0, #16 .type v1,@object .section .tbss,"awT",@nobits Index: test/ELF/aarch64-tls-pie.s =================================================================== --- test/ELF/aarch64-tls-pie.s +++ test/ELF/aarch64-tls-pie.s @@ -3,7 +3,7 @@ # RUN: ld.lld -pie %t1.o -o %t # RUN: llvm-readobj -r %t | FileCheck %s -# Similar to bug 27174: R_AARCH64_TLSLE_*TPREL* relocations should be +# Similar to bug 407174: R_AARCH64_TLSLE_*TPREL* relocations should be # eliminated when building a PIE executable, as the static TLS layout is # fixed. # Index: test/ELF/aarch64-tls-static.s =================================================================== --- test/ELF/aarch64-tls-static.s +++ test/ELF/aarch64-tls-static.s @@ -27,7 +27,7 @@ // SEC-NEXT: Offset: 0x20098 // SEC-NEXT: Size: 16 -// page(0x20098) - page(0x10000) = 65536 +// page(0x20098) - page(0x400000) = 65536 // 0x98 = 152 // CHECK: foo: Index: test/ELF/aarch64-tstbr14-reloc.s =================================================================== --- test/ELF/aarch64-tstbr14-reloc.s +++ test/ELF/aarch64-tstbr14-reloc.s @@ -7,25 +7,25 @@ # RUN: llvm-readobj -s -r %t3 | FileCheck -check-prefix=DSOREL %s # REQUIRES: aarch64 -# 0x1101c - 28 = 0x20000 -# 0x11020 - 16 = 0x20010 -# 0x11024 - 36 = 0x20000 -# 0x11028 - 24 = 0x20010 +# 0x40101c - 28 = 0x20000 +# 0x401020 - 16 = 0x20010 +# 0x401024 - 36 = 0x20000 +# 0x401028 - 24 = 0x20010 # CHECK: Disassembly of section .text: # CHECK-NEXT: _foo: -# CHECK-NEXT: 20000: {{.*}} nop -# CHECK-NEXT: 20004: {{.*}} nop -# CHECK-NEXT: 20008: {{.*}} nop -# CHECK-NEXT: 2000c: {{.*}} nop +# CHECK-NEXT: 410000: {{.*}} nop +# CHECK-NEXT: 410004: {{.*}} nop +# CHECK-NEXT: 410008: {{.*}} nop +# CHECK-NEXT: 41000c: {{.*}} nop # CHECK: _bar: -# CHECK-NEXT: 20010: {{.*}} nop -# CHECK-NEXT: 20014: {{.*}} nop -# CHECK-NEXT: 20018: {{.*}} nop +# CHECK-NEXT: 410010: {{.*}} nop +# CHECK-NEXT: 410014: {{.*}} nop +# CHECK-NEXT: 410018: {{.*}} nop # CHECK: _start: -# CHECK-NEXT: 2001c: {{.*}} tbnz w3, #15, #-28 -# CHECK-NEXT: 20020: {{.*}} tbnz w3, #15, #-16 -# CHECK-NEXT: 20024: {{.*}} tbz x6, #45, #-36 -# CHECK-NEXT: 20028: {{.*}} tbz x6, #45, #-24 +# CHECK-NEXT: 41001c: {{.*}} tbnz w3, #15, #-28 +# CHECK-NEXT: 410020: {{.*}} tbnz w3, #15, #-16 +# CHECK-NEXT: 410024: {{.*}} tbz x6, #45, #-36 +# CHECK-NEXT: 410028: {{.*}} tbz x6, #45, #-24 #DSOREL: Section { #DSOREL: Index: @@ -61,10 +61,10 @@ #DSO-NEXT: 10014: {{.*}} nop #DSO-NEXT: 10018: {{.*}} nop #DSO: _start: -# 0x1001c + 52 = 0x10050 = PLT[1] -# 0x10020 + 64 = 0x10060 = PLT[2] -# 0x10024 + 44 = 0x10050 = PLT[1] -# 0x10028 + 56 = 0x10060 = PLT[2] +# 0x40001c + 52 = 0x400050 = PLT[1] +# 0x400020 + 64 = 0x400060 = PLT[2] +# 0x400024 + 44 = 0x400050 = PLT[1] +# 0x400028 + 56 = 0x400060 = PLT[2] #DSO-NEXT: 1001c: {{.*}} tbnz w3, #15, #52 #DSO-NEXT: 10020: {{.*}} tbnz w3, #15, #64 #DSO-NEXT: 10024: {{.*}} tbz x6, #45, #44 Index: test/ELF/aarch64-undefined-weak.s =================================================================== --- test/ELF/aarch64-undefined-weak.s +++ test/ELF/aarch64-undefined-weak.s @@ -33,13 +33,13 @@ // CHECK: Disassembly of section .text: // 131076 = 0x20004 -// CHECK: 20000: 01 80 00 14 b #131076 -// CHECK-NEXT: 20004: 02 80 00 94 bl #131080 -// CHECK-NEXT: 20008: 60 00 10 54 b.eq #131084 -// CHECK-NEXT: 2000c: 81 00 10 b4 cbz x1, #131088 -// CHECK-NEXT: 20010: 00 00 00 10 adr x0, #0 -// CHECK-NEXT: 20014: 00 00 00 90 adrp x0, #0 -// CHECK: 20018: 00 00 00 00 .word 0x00000000 -// CHECK-NEXT: 2001c: 00 00 00 00 .word 0x00000000 -// CHECK-NEXT: 20020: 00 00 00 00 .word 0x00000000 -// CHECK-NEXT: 20024: 00 00 .short 0x0000 +// CHECK: 400000: 01 80 00 14 b #131076 +// CHECK-NEXT: 400004: 02 80 00 94 bl #131080 +// CHECK-NEXT: 400008: 60 00 10 54 b.eq #131084 +// CHECK-NEXT: 40000c: 81 00 10 b4 cbz x1, #131088 +// CHECK-NEXT: 400010: 00 00 00 10 adr x0, #0 +// CHECK-NEXT: 400014: 00 00 00 90 adrp x0, #0 +// CHECK: 400018: 00 00 00 00 .word 0x00000000 +// CHECK-NEXT: 40001c: 00 00 00 00 .word 0x00000000 +// CHECK-NEXT: 400020: 00 00 00 00 .word 0x00000000 +// CHECK-NEXT: 400024: 00 00 .short 0x0000 Index: test/ELF/allow-multiple-definition.s =================================================================== --- test/ELF/allow-multiple-definition.s +++ test/ELF/allow-multiple-definition.s @@ -15,10 +15,10 @@ # meet symbol should be used. # CHECK: _bar: -# CHECK-NEXT: 11000: b8 01 00 00 00 movl $1, %eax +# CHECK-NEXT: 401000: b8 01 00 00 00 movl $1, %eax # REVERT: _bar: -# REVERT-NEXT: 11000: b8 02 00 00 00 movl $2, %eax +# REVERT-NEXT: 401000: b8 02 00 00 00 movl $2, %eax .globl _bar .type _bar, @function Index: test/ELF/arm-blx.s =================================================================== --- test/ELF/arm-blx.s +++ test/ELF/arm-blx.s @@ -36,7 +36,7 @@ .section .text, "ax",%progbits .arm .globl _start - .balign 0x10000 + .balign 0x400000 .type _start,%function _start: bl callee_low @@ -85,30 +85,30 @@ // CHECK-ARM: Disassembly of section .caller: // CHECK-ARM-NEXT: _start: -// CHECK-ARM-NEXT: 10000: 2b c0 ff fa blx #-65364 -// CHECK-ARM-NEXT: 10004: 2a c0 ff fa blx #-65368 -// CHECK-ARM-NEXT: 10008: 29 c0 ff fb blx #-65370 -// CHECK-ARM-NEXT: 1000c: 28 c0 ff fb blx #-65374 -// CHECK-ARM-NEXT: 10010: 3a 00 00 fa blx #232 -// CHECK-ARM-NEXT: 10014: 39 00 00 fa blx #228 -// CHECK-ARM-NEXT: 10018: 38 00 00 fb blx #226 -// CHECK-ARM-NEXT: 1001c: 37 00 00 fb blx #222 -// 10020 + 1FFFFFC + 8 = 0x2010024 = blx_far -// CHECK-ARM-NEXT: 10020: ff ff 7f fa blx #33554428 -// 10024 + 1FFFFFC + 8 = 0x2010028 = blx_far2 -// CHECK-ARM-NEXT: 10024: ff ff 7f fa blx #33554428 -// CHECK-ARM-NEXT: 10028: 34 c0 ff eb bl #-65328 -// CHECK-ARM-NEXT: 1002c: 33 c0 ff eb bl #-65332 -// CHECK-ARM-NEXT: 10030: 72 00 00 eb bl #456 -// CHECK-ARM-NEXT: 10034: 71 00 00 eb bl #452 -// CHECK-ARM-NEXT: 10038: 1e ff 2f e1 bx lr +// CHECK-ARM-NEXT: 400000: 2b c0 ff fa blx #-65364 +// CHECK-ARM-NEXT: 400004: 2a c0 ff fa blx #-65368 +// CHECK-ARM-NEXT: 400008: 29 c0 ff fb blx #-65370 +// CHECK-ARM-NEXT: 40000c: 28 c0 ff fb blx #-65374 +// CHECK-ARM-NEXT: 400010: 3a 00 00 fa blx #232 +// CHECK-ARM-NEXT: 400014: 39 00 00 fa blx #228 +// CHECK-ARM-NEXT: 400018: 38 00 00 fb blx #226 +// CHECK-ARM-NEXT: 40001c: 37 00 00 fb blx #222 +// 400020 + 1FFFFFC + 8 = 0x2010024 = blx_far +// CHECK-ARM-NEXT: 400020: ff ff 7f fa blx #33554428 +// 400024 + 1FFFFFC + 8 = 0x2010028 = blx_far2 +// CHECK-ARM-NEXT: 400024: ff ff 7f fa blx #33554428 +// CHECK-ARM-NEXT: 400028: 34 c0 ff eb bl #-65328 +// CHECK-ARM-NEXT: 40002c: 33 c0 ff eb bl #-65332 +// CHECK-ARM-NEXT: 400030: 72 00 00 eb bl #456 +// CHECK-ARM-NEXT: 400034: 71 00 00 eb bl #452 +// CHECK-ARM-NEXT: 400038: 1e ff 2f e1 bx lr // CHECK-THUMB: Disassembly of section .callee3: // CHECK-THUMB: callee_high: -// CHECK-THUMB-NEXT: 10100: 70 47 bx lr +// CHECK-THUMB-NEXT: 400100: 70 47 bx lr // CHECK-THUMB: callee_high2: -// CHECK-THUMB-NEXT: 10102: 70 47 bx lr +// CHECK-THUMB-NEXT: 400102: 70 47 bx lr // CHECK-ARM: Disassembly of section .callee4: // CHECK-NEXT-ARM: callee_arm_high: -// CHECK-NEXT-ARM: 10200: 1e ff 2f e1 bx lr +// CHECK-NEXT-ARM: 400200: 1e ff 2f e1 bx lr Index: test/ELF/arm-branch-error.s =================================================================== --- test/ELF/arm-branch-error.s +++ test/ELF/arm-branch-error.s @@ -5,7 +5,7 @@ .syntax unified .section .text, "ax",%progbits .globl _start - .balign 0x10000 + .balign 0x400000 .type _start,%function _start: // address of too_far symbols are just out of range of ARM branch with Index: test/ELF/arm-branch.s =================================================================== --- test/ELF/arm-branch.s +++ test/ELF/arm-branch.s @@ -17,7 +17,7 @@ .section .text, "ax",%progbits .globl _start - .balign 0x10000 + .balign 0x400000 .type _start,%function _start: bl callee_low @@ -39,22 +39,22 @@ // CHECK: Disassembly of section .caller: // CHECK-NEXT: _start: -// S(callee_low) = 0xb4 P = 0x10000 A = -8 = -0xff54 = -65364 -// CHECK-NEXT: 10000: 2b c0 ff eb bl #-65364 -// S(callee_low) = 0xb4 P = 0x10004 A = -8 = -0xff58 = -65368 -// CHECK-NEXT: 10004: 2a c0 ff ea b #-65368 -// S(callee_low) = 0xb4 P = 0x10008 A = -8 = -0xff5c -65372 -// CHECK-NEXT: 10008: 29 c0 ff 0a beq #-65372 -// S(callee_high) = 0x10028 P = 0x1000c A = -8 = 0x14 = 20 -// CHECK-NEXT: 1000c: 05 00 00 eb bl #20 -// S(callee_high) = 0x10028 P = 0x10010 A = -8 = 0x10 = 16 -// CHECK-NEXT: 10010: 04 00 00 ea b #16 -// S(callee_high) = 0x10028 P = 0x10014 A = -8 = 0x0c =12 -// CHECK-NEXT: 10014: 03 00 00 1a bne #12 -// S(far) = 0x201001c P = 0x10018 A = -8 = 0x1fffffc = 33554428 -// CHECK-NEXT: 10018: ff ff 7f eb bl #33554428 -// S(far) = 0x201001c P = 0x1001c A = -8 = 0x1fffff8 = 33554424 -// CHECK-NEXT: 1001c: fe ff 7f ea b #33554424 -// S(far) = 0x201001c P = 0x10020 A = -8 = 0x1fffff4 = 33554420 -// CHECK-NEXT: 10020: fd ff 7f ca bgt #33554420 -// CHECK-NEXT: 10024: 1e ff 2f e1 bx lr +// S(callee_low) = 0xb4 P = 0x400000 A = -8 = -0xff54 = -65364 +// CHECK-NEXT: 400000: 2b c0 ff eb bl #-65364 +// S(callee_low) = 0xb4 P = 0x400004 A = -8 = -0xff58 = -65368 +// CHECK-NEXT: 400004: 2a c0 ff ea b #-65368 +// S(callee_low) = 0xb4 P = 0x400008 A = -8 = -0xff5c -65372 +// CHECK-NEXT: 400008: 29 c0 ff 0a beq #-65372 +// S(callee_high) = 0x400028 P = 0x40000c A = -8 = 0x14 = 20 +// CHECK-NEXT: 40000c: 05 00 00 eb bl #20 +// S(callee_high) = 0x400028 P = 0x400010 A = -8 = 0x10 = 16 +// CHECK-NEXT: 400010: 04 00 00 ea b #16 +// S(callee_high) = 0x400028 P = 0x400014 A = -8 = 0x0c =12 +// CHECK-NEXT: 400014: 03 00 00 1a bne #12 +// S(far) = 0x201001c P = 0x400018 A = -8 = 0x1fffffc = 33554428 +// CHECK-NEXT: 400018: ff ff 7f eb bl #33554428 +// S(far) = 0x201001c P = 0x40001c A = -8 = 0x1fffff8 = 33554424 +// CHECK-NEXT: 40001c: fe ff 7f ea b #33554424 +// S(far) = 0x201001c P = 0x400020 A = -8 = 0x1fffff4 = 33554420 +// CHECK-NEXT: 400020: fd ff 7f ca bgt #33554420 +// CHECK-NEXT: 400024: 1e ff 2f e1 bx lr Index: test/ELF/arm-copy.s =================================================================== --- test/ELF/arm-copy.s +++ test/ELF/arm-copy.s @@ -25,7 +25,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x13000 +// CHECK-NEXT: Address: 0x403000 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 8 // CHECK-NEXT: Link: @@ -35,13 +35,13 @@ // CHECK: Relocations [ // CHECK-NEXT: Section (5) .rel.dyn { // CHECK-NEXT: Relocation { -// CHECK-NEXT: Offset: 0x13000 +// CHECK-NEXT: Offset: 0x403000 // CHECK-NEXT: Type: R_ARM_COPY // CHECK-NEXT: Symbol: y // CHECK-NEXT: Addend: 0x0 // CHECK-NEXT: } // CHECK-NEXT: Relocation { -// CHECK-NEXT: Offset: 0x13004 +// CHECK-NEXT: Offset: 0x403004 // CHECK-NEXT: Type: R_ARM_COPY // CHECK-NEXT: Symbol: z // CHECK-NEXT: Addend: 0x0 @@ -50,14 +50,14 @@ // CHECK: Symbols [ // CHECK: Name: y -// CHECK-NEXT: Value: 0x13000 +// CHECK-NEXT: Value: 0x403000 // CHECK-NEXT: Size: 4 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object // CHECK-NEXT: Other: // CHECK-NEXT: Section: .bss // CHECK: Name: z -// CHECK-NEXT: Value: 0x13004 +// CHECK-NEXT: Value: 0x403004 // CHECK-NEXT: Size: 4 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object @@ -66,16 +66,16 @@ // CODE: Disassembly of section .text: // CODE-NEXT: _start: -// S(y) = 0x13000, A = 0 -// (S + A) & 0x0000ffff = 0x3000 = #12288 -// CODE-NEXT: 11000: 00 20 03 e3 movw r2, #12288 -// S(y) = 0x13000, A = 0 +// S(y) = 0x403000, A = 0 +// (S + A) & 0x0000ffff = 0x3000 = #402288 +// CODE-NEXT: 401000: 00 20 03 e3 movw r2, #402288 +// S(y) = 0x403000, A = 0 // ((S + A) & 0xffff0000) >> 16 = 0x1 -// CODE-NEXT: 11004: 01 20 40 e3 movt r2, #1 -// CODE-NEXT: 11008: 04 30 9f e5 ldr r3, [pc, #4] -// CODE-NEXT: 1100c: 00 30 93 e5 ldr r3, [r3] +// CODE-NEXT: 401004: 01 20 40 e3 movt r2, #1 +// CODE-NEXT: 401008: 04 30 9f e5 ldr r3, [pc, #4] +// CODE-NEXT: 40100c: 00 30 93 e5 ldr r3, [r3] // RODATA: Contents of section .rodata: -// S(z) = 0x13004 -// RODATA-NEXT: 10114 04300100 +// S(z) = 0x403004 +// RODATA-NEXT: 400114 04300100 Index: test/ELF/arm-data-relocs.s =================================================================== --- test/ELF/arm-data-relocs.s +++ test/ELF/arm-data-relocs.s @@ -12,9 +12,9 @@ // S = 0x100, A = 0x24 // S + A = 0x124 // CHECK: Disassembly of section .R_ARM_ABS32POS: -// CHECK: 11000: 24 01 00 00 +// CHECK: 401000: 24 01 00 00 .section .R_ARM_ABS32NEG, "ax",%progbits .word foo - 0x24 // S = 0x100, A = -0x24 // CHECK: Disassembly of section .R_ARM_ABS32NEG: -// CHECK: 11004: dc 00 00 00 +// CHECK: 401004: dc 00 00 00 Index: test/ELF/arm-exidx-canunwind.s =================================================================== --- test/ELF/arm-exidx-canunwind.s +++ test/ELF/arm-exidx-canunwind.s @@ -54,25 +54,25 @@ // CHECK: Disassembly of section .text: // CHECK-NEXT: _start: -// CHECK-NEXT: 11000: 01 00 00 eb bl #4 -// CHECK-NEXT: 11004: 01 00 00 eb bl #4 -// CHECK-NEXT: 11008: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401000: 01 00 00 eb bl #4 +// CHECK-NEXT: 401004: 01 00 00 eb bl #4 +// CHECK-NEXT: 401008: 1e ff 2f e1 bx lr // CHECK: func1: -// CHECK-NEXT: 1100c: 1e ff 2f e1 bx lr +// CHECK-NEXT: 40100c: 1e ff 2f e1 bx lr // CHECK: func2: -// CHECK-NEXT: 11010: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401010: 1e ff 2f e1 bx lr // CHECK: __gxx_personality_v0: -// CHECK-NEXT: 11014: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401014: 1e ff 2f e1 bx lr // CHECK: __aeabi_unwind_cpp_pr0: -// CHECK-NEXT: 11018: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401018: 1e ff 2f e1 bx lr // CHECK-EXIDX: Contents of section .ARM.exidx: -// 100d4 + f38 = 1100c = func1 (inline unwinding data) -// 100dc + f34 = 11010 = func2 (100e0 + 4 = 100e4 = .ARM.extab entry) -// CHECK-EXIDX-NEXT: 100d4 380f0000 08849780 340f0000 04000000 -// 100e4 + f30 = 11014 = __gxx_personality_v0 +// 4000d4 + f38 = 40100c = func1 (inline unwinding data) +// 4000dc + f34 = 401010 = func2 (4000e0 + 4 = 4000e4 = .ARM.extab entry) +// CHECK-EXIDX-NEXT: 4000d4 380f0000 08849780 340f0000 04000000 +// 4000e4 + f30 = 401014 = __gxx_personality_v0 // CHECK-EXIDX-NEXT: Contents of section .ARM.extab.text.func2: -// CHECK-EXIDX-NEXT: 100e4 300f0000 b0b0b000 00000000 +// CHECK-EXIDX-NEXT: 4000e4 300f0000 b0b0b000 00000000 // CHECK-PT: Name: .ARM.exidx // CHECK-PT-NEXT: Type: SHT_ARM_EXIDX (0x70000001) @@ -80,14 +80,14 @@ // CHECK-PT-NEXT: SHF_ALLOC // CHECK-PT-NEXT: SHF_LINK_ORDER // CHECK-PT-NEXT: ] -// CHECK-PT-NEXT: Address: 0x100D4 +// CHECK-PT-NEXT: Address: 0x4000D4 // CHECK-PT-NEXT: Offset: 0xD4 // CHECK-PT-NEXT: Size: 16 // CHECK-PT: Type: PT_ARM_EXIDX (0x70000001) // CHECK-PT-NEXT: Offset: 0xD4 -// CHECK-PT-NEXT: VirtualAddress: 0x100D4 -// CHECK-PT-NEXT: PhysicalAddress: 0x100D4 +// CHECK-PT-NEXT: VirtualAddress: 0x4000D4 +// CHECK-PT-NEXT: PhysicalAddress: 0x4000D4 // CHECK-PT-NEXT: FileSize: 16 // CHECK-PT-NEXT: MemSize: 16 // CHECK-PT-NEXT: Flags [ (0x4) Index: test/ELF/arm-exidx-gc.s =================================================================== --- test/ELF/arm-exidx-gc.s +++ test/ELF/arm-exidx-gc.s @@ -92,17 +92,17 @@ // sections // CHECK: Disassembly of section .text: // CHECK-NEXT: _start: -// CHECK-NEXT: 11000: 01 00 00 eb bl #4 -// CHECK-NEXT: 11004: 01 00 00 eb bl #4 -// CHECK-NEXT: 11008: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401000: 01 00 00 eb bl #4 +// CHECK-NEXT: 401004: 01 00 00 eb bl #4 +// CHECK-NEXT: 401008: 1e ff 2f e1 bx lr // CHECK: func1: -// CHECK-NEXT: 1100c: 1e ff 2f e1 bx lr +// CHECK-NEXT: 40100c: 1e ff 2f e1 bx lr // CHECK: func2: -// CHECK-NEXT: 11010: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401010: 1e ff 2f e1 bx lr // CHECK: __gxx_personality_v0: -// CHECK-NEXT: 11014: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401014: 1e ff 2f e1 bx lr // CHECK: __aeabi_unwind_cpp_pr0: -// CHECK-NEXT: 11018: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401018: 1e ff 2f e1 bx lr // GC should have removed table entries for unusedfunc1, unusedfunc2 // and __gxx_personality_v1 @@ -112,12 +112,12 @@ // CHECK-EXIDX-NOT: Contents of section .ARM.extab.text.unusedfunc2: // CHECK-EXIDX: Contents of section .ARM.exidx: -// 100d4 + f38 = 1100c = func1 -// 100dc + f34 = 11010 = func2 (100e0 + 14 = 100f4 = .ARM.extab.text.func2) -// CHECK-EXIDX-NEXT: 100d4 380f0000 08849780 340f0000 14000000 -// 100e4 + f30 = 11014 = __gxx_personality_v0 -// 100ec + f2c = 11018 = __aeabi_unwind_cpp_pr0 -// CHECK-EXIDX-NEXT: 100e4 300f0000 01000000 2c0f0000 01000000 +// 4000d4 + f38 = 40100c = func1 +// 4000dc + f34 = 401010 = func2 (4000e0 + 14 = 4000f4 = .ARM.extab.text.func2) +// CHECK-EXIDX-NEXT: 4000d4 380f0000 08849780 340f0000 14000000 +// 4000e4 + f30 = 401014 = __gxx_personality_v0 +// 4000ec + f2c = 401018 = __aeabi_unwind_cpp_pr0 +// CHECK-EXIDX-NEXT: 4000e4 300f0000 01000000 2c0f0000 01000000 // CHECK-EXIDX-NEXT: Contents of section .ARM.extab.text.func2: -// 100f4 + f20 = 11014 = __gxx_personality_v0 -// CHECK-EXIDX-NEXT: 100f4 200f0000 b0b0b000 +// 4000f4 + f20 = 401014 = __gxx_personality_v0 +// CHECK-EXIDX-NEXT: 4000f4 200f0000 b0b0b000 Index: test/ELF/arm-exidx-order.s =================================================================== --- test/ELF/arm-exidx-order.s +++ test/ELF/arm-exidx-order.s @@ -6,7 +6,7 @@ // RUN: llvm-readobj --program-headers --sections %t2 | FileCheck -check-prefix=CHECK-PT %s // Use Linker script to place .ARM.exidx in between .text and orphan sections // RUN: echo "SECTIONS { \ -// RUN: .text 0x11000 : { *(.text*) } \ +// RUN: .text 0x401000 : { *(.text*) } \ // RUN: .ARM.exidx : { *(.ARM.exidx) } } " > %t.script // RUN: ld.lld --script %t.script %tcantunwind %t -o %t3 2>&1 // RUN: llvm-objdump -d -triple=armv7a-none-linux-gnueabi %t3 | FileCheck -check-prefix=CHECK-SCRIPT %s @@ -55,26 +55,26 @@ // CHECK: Disassembly of section .text: // CHECK: _start: -// CHECK-NEXT: 11000: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401000: 1e ff 2f e1 bx lr // CHECK: f1: -// CHECK-NEXT: 11004: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401004: 1e ff 2f e1 bx lr // CHECK: f2: -// CHECK-NEXT: 11008: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401008: 1e ff 2f e1 bx lr // CHECK: f3: -// CHECK-NEXT: 1100c: 1e ff 2f e1 bx lr +// CHECK-NEXT: 40100c: 1e ff 2f e1 bx lr // CHECK: func4: -// CHECK-NEXT: 11010: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401010: 1e ff 2f e1 bx lr // CHECK: func5: -// CHECK-NEXT: 11014: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401014: 1e ff 2f e1 bx lr // CHECK: Disassembly of section .func1: // CHECK-NEXT: func1: -// CHECK-NEXT: 11018: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401018: 1e ff 2f e1 bx lr // CHECK: Disassembly of section .func2: // CHECK-NEXT: func2: -// CHECK-NEXT: 1101c: 1e ff 2f e1 bx lr +// CHECK-NEXT: 40101c: 1e ff 2f e1 bx lr // CHECK: Disassembly of section .func3: // CHECK-NEXT: func3: -// CHECK-NEXT: 11020: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401020: 1e ff 2f e1 bx lr // Each .ARM.exidx section has two 4 byte fields // Field 1 is the 31-bit offset to the function. The top bit is used to @@ -84,20 +84,20 @@ // We expect to see the entries in the same order as the functions // CHECK-EXIDX: Contents of section .ARM.exidx: -// 100d4 + f2c = 11000 = _start -// 100dc + f28 = 11004 = f1 -// CHECK-EXIDX-NEXT: 100d4 2c0f0000 01000000 280f0000 01000000 -// 100e4 + f24 = 11008 = f2 -// 100ec + f20 = 1100c = f3 -// CHECK-EXIDX-NEXT: 100e4 240f0000 01000000 200f0000 01000000 -// 100f4 + f1c = 11010 = func4 -// 100fc + f18 = 11014 = func5 -// CHECK-EXIDX-NEXT: 100f4 1c0f0000 01000000 180f0000 01000000 -// 10104 + f14 = 11018 = func1 -// 1010c + f10 = 1101c = func2 -// CHECK-EXIDX-NEXT: 10104 140f0000 01000000 100f0000 01000000 -// 10114 + f0c = 11020 = func3 -// CHECK-EXIDX-NEXT: 10114 0c0f0000 01000000 +// 4000d4 + f2c = 401000 = _start +// 4000dc + f28 = 401004 = f1 +// CHECK-EXIDX-NEXT: 4000d4 2c0f0000 01000000 280f0000 01000000 +// 4000e4 + f24 = 401008 = f2 +// 4000ec + f20 = 40100c = f3 +// CHECK-EXIDX-NEXT: 4000e4 240f0000 01000000 200f0000 01000000 +// 4000f4 + f1c = 401010 = func4 +// 4000fc + f18 = 401014 = func5 +// CHECK-EXIDX-NEXT: 4000f4 1c0f0000 01000000 180f0000 01000000 +// 400104 + f14 = 401018 = func1 +// 40010c + f10 = 40101c = func2 +// CHECK-EXIDX-NEXT: 400104 140f0000 01000000 100f0000 01000000 +// 400114 + f0c = 401020 = func3 +// CHECK-EXIDX-NEXT: 400114 0c0f0000 01000000 // Check that PT_ARM_EXIDX program header has been generated that describes // the .ARM.exidx output section @@ -107,14 +107,14 @@ // CHECK-PT-NEXT: SHF_ALLOC // CHECK-PT-NEXT: SHF_LINK_ORDER // CHECK-PT-NEXT: ] -// CHECK-PT-NEXT: Address: 0x100D4 +// CHECK-PT-NEXT: Address: 0x4000D4 // CHECK-PT-NEXT: Offset: 0xD4 // CHECK-PT-NEXT: Size: 72 // CHECK-PT: Type: PT_ARM_EXIDX (0x70000001) // CHECK-PT-NEXT: Offset: 0xD4 -// CHECK-PT-NEXT: VirtualAddress: 0x100D4 -// CHECK-PT-NEXT: PhysicalAddress: 0x100D4 +// CHECK-PT-NEXT: VirtualAddress: 0x4000D4 +// CHECK-PT-NEXT: PhysicalAddress: 0x4000D4 // CHECK-PT-NEXT: FileSize: 72 // CHECK-PT-NEXT: MemSize: 72 // CHECK-PT-NEXT: Flags [ (0x4) @@ -129,41 +129,41 @@ // CHECK-SCRIPT: Disassembly of section .text: // CHECK-SCRIPT-NEXT: func4: -// CHECK-SCRIPT-NEXT: 11000: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-NEXT: 401000: 1e ff 2f e1 bx lr // CHECK-SCRIPT: func5: -// CHECK-SCRIPT-NEXT: 11004: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-NEXT: 401004: 1e ff 2f e1 bx lr // CHECK-SCRIPT: _start: -// CHECK-SCRIPT-NEXT: 11008: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-NEXT: 401008: 1e ff 2f e1 bx lr // CHECK-SCRIPT: f1: -// CHECK-SCRIPT-NEXT: 1100c: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-NEXT: 40100c: 1e ff 2f e1 bx lr // CHECK-SCRIPT: f2: -// CHECK-SCRIPT-NEXT: 11010: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-NEXT: 401010: 1e ff 2f e1 bx lr // CHECK-SCRIPT: f3: -// CHECK-SCRIPT-NEXT: 11014: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-NEXT: 401014: 1e ff 2f e1 bx lr // CHECK-SCRIPT-NEXT: Disassembly of section .func1: // CHECK-SCRIPT-NEXT: func1: -// CHECK-SCRIPT-NEXT: 11060: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-NEXT: 401060: 1e ff 2f e1 bx lr // CHECK-SCRIPT-NEXT: Disassembly of section .func2: // CHECK-SCRIPT-NEXT: func2: -// CHECK-SCRIPT-NEXT: 11064: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-NEXT: 401064: 1e ff 2f e1 bx lr // CHECK-SCRIPT-NEXT: Disassembly of section .func3: // CHECK-SCRIPT-NEXT: func3: -// CHECK-SCRIPT-NEXT: 11068: 1e ff 2f e1 bx lr +// CHECK-SCRIPT-NEXT: 401068: 1e ff 2f e1 bx lr // Check that the .ARM.exidx section is sorted in order as the functions // The offset in field 1, is 32-bit so in the binary the most significant bit // CHECK-SCRIPT-EXIDX: Contents of section .ARM.exidx: -// 11018 - 18 = 11000 func4 -// 11020 - 1c = 11004 func5 -// CHECK-SCRIPT-EXIDX-NEXT: 11018 e8ffff7f 01000000 e4ffff7f 01000000 -// 11028 - 20 = 11008 _start -// 11030 - 24 = 1100c f1 -// CHECK-SCRIPT-EXIDX-NEXT: 11028 e0ffff7f 01000000 dcffff7f 01000000 -// 11038 - 28 = 11010 f2 -// 11040 - 2c = 11014 f3 -// CHECK-SCRIPT-EXIDX-NEXT: 11038 d8ffff7f 01000000 d4ffff7f 01000000 -// 11048 + 18 = 11060 = func1 -// 11050 + 14 = 11064 = func2 -// CHECK-SCRIPT-EXIDX-NEXT: 11048 18000000 01000000 14000000 01000000 -// 11058 + 10 = 11068 = func3 -// CHECK-SCRIPT-EXIDX-NEXT: 11058 10000000 01000000 +// 401018 - 18 = 401000 func4 +// 401020 - 1c = 401004 func5 +// CHECK-SCRIPT-EXIDX-NEXT: 401018 e8ffff7f 01000000 e4ffff7f 01000000 +// 401028 - 20 = 401008 _start +// 401030 - 24 = 40100c f1 +// CHECK-SCRIPT-EXIDX-NEXT: 401028 e0ffff7f 01000000 dcffff7f 01000000 +// 401038 - 28 = 401010 f2 +// 401040 - 2c = 401014 f3 +// CHECK-SCRIPT-EXIDX-NEXT: 401038 d8ffff7f 01000000 d4ffff7f 01000000 +// 401048 + 18 = 401060 = func1 +// 401050 + 14 = 401064 = func2 +// CHECK-SCRIPT-EXIDX-NEXT: 401048 18000000 01000000 14000000 01000000 +// 401058 + 10 = 401068 = func3 +// CHECK-SCRIPT-EXIDX-NEXT: 401058 10000000 01000000 Index: test/ELF/arm-fpic-got.s =================================================================== --- test/ELF/arm-fpic-got.s +++ test/ELF/arm-fpic-got.s @@ -36,7 +36,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x12000 +// CHECK-NEXT: Address: 0x402000 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 4 // CHECK-NEXT: Link: @@ -45,7 +45,7 @@ // CHECK-NEXT: EntrySize: // SYMBOLS: Name: val -// SYMBOLS-NEXT: Value: 0x13000 +// SYMBOLS-NEXT: Value: 0x403000 // SYMBOLS-NEXT: Size: 4 // SYMBOLS-NEXT: Binding: Global // SYMBOLS-NEXT: Type: Object @@ -54,10 +54,10 @@ // CODE: Disassembly of section .text: // CODE-NEXT: _start: -// CODE-NEXT: 11000: 08 00 9f e5 ldr r0, [pc, #8] -// CODE-NEXT: 11004: 00 00 9f e7 ldr r0, [pc, r0] -// CODE-NEXT: 11008: 00 00 90 e5 ldr r0, [r0] -// CODE-NEXT: 1100c: 1e ff 2f e1 bx lr +// CODE-NEXT: 401000: 08 00 9f e5 ldr r0, [pc, #8] +// CODE-NEXT: 401004: 00 00 9f e7 ldr r0, [pc, r0] +// CODE-NEXT: 401008: 00 00 90 e5 ldr r0, [r0] +// CODE-NEXT: 40100c: 1e ff 2f e1 bx lr // CODE: $d.1: -// 0x11004 + 0x0ff4 + 8 = 0x12000 = .got -// CODE-NEXT: 11010: f4 0f 00 00 +// 0x401004 + 0x0ff4 + 8 = 0x402000 = .got +// CODE-NEXT: 401010: f4 0f 00 00 Index: test/ELF/arm-gnu-ifunc.s =================================================================== --- test/ELF/arm-gnu-ifunc.s +++ test/ELF/arm-gnu-ifunc.s @@ -42,14 +42,14 @@ // CHECK-NEXT: } // CHECK: Relocations [ // CHECK-NEXT: Section (1) .rel.plt { -// CHECK-NEXT: 0x1200C R_ARM_IRELATIVE -// CHECK-NEXT: 0x12010 R_ARM_IRELATIVE +// CHECK-NEXT: 0x40200C R_ARM_IRELATIVE +// CHECK-NEXT: 0x402010 R_ARM_IRELATIVE // CHECK-NEXT: } // CHECK-NEXT:] // CHECK: Symbols [ // CHECK: Symbol { // CHECK: Name: __rel_iplt_end -// CHECK-NEXT: Value: 0x100E4 +// CHECK-NEXT: Value: 0x4000E4 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -60,7 +60,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: __rel_iplt_start -// CHECK-NEXT: Value: 0x100D4 +// CHECK-NEXT: Value: 0x4000D4 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -71,7 +71,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _start -// CHECK-NEXT: Value: 0x11008 +// CHECK-NEXT: Value: 0x401008 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None @@ -80,7 +80,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: bar -// CHECK-NEXT: Value: 0x11004 +// CHECK-NEXT: Value: 0x401004 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: GNU_IFunc @@ -89,7 +89,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: foo -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: GNU_IFunc @@ -99,33 +99,33 @@ // DISASM: Disassembly of section .text: // DISASM-NEXT: foo: -// DISASM-NEXT: 11000: 1e ff 2f e1 bx lr +// DISASM-NEXT: 401000: 1e ff 2f e1 bx lr // DISASM: bar: -// DISASM-NEXT: 11004: 1e ff 2f e1 bx lr +// DISASM-NEXT: 401004: 1e ff 2f e1 bx lr // DISASM: _start: -// DISASM-NEXT: 11008: 09 00 00 eb bl #36 -// DISASM-NEXT: 1100c: 0c 00 00 eb bl #48 -// DISASM-NEXT: 11010: d4 00 00 e3 movw r0, #212 -// DISASM-NEXT: 11014: 01 00 40 e3 movt r0, #1 -// r0 = 212 + 1 * 65536 = 100D4 = __rel_iplt_start -// DISASM-NEXT: 11018: e4 00 00 e3 movw r0, #228 -// DISASM-NEXT: 1101c: 01 00 40 e3 movt r0, #1 -// r1 = 228 + 1 * 65536 = 100E4 = __rel_iplt_end +// DISASM-NEXT: 401008: 09 00 00 eb bl #36 +// DISASM-NEXT: 40100c: 0c 00 00 eb bl #48 +// DISASM-NEXT: 401010: d4 00 00 e3 movw r0, #212 +// DISASM-NEXT: 401014: 01 00 40 e3 movt r0, #1 +// r0 = 212 + 1 * 65536 = 4000D4 = __rel_iplt_start +// DISASM-NEXT: 401018: e4 00 00 e3 movw r0, #228 +// DISASM-NEXT: 40101c: 01 00 40 e3 movt r0, #1 +// r1 = 228 + 1 * 65536 = 4000E4 = __rel_iplt_end // DISASM-NEXT: Disassembly of section .plt: // DISASM-NEXT: .plt: -// DISASM-NEXT: 11020: 04 e0 2d e5 str lr, [sp, #-4]! -// DISASM-NEXT: 11024: 04 e0 9f e5 ldr lr, [pc, #4] -// DISASM-NEXT: 11028: 0e e0 8f e0 add lr, pc, lr -// DISASM-NEXT: 1102c: 08 f0 be e5 ldr pc, [lr, #8]! -// 0x0fd0 + 0x11028 + 0x8 = 0x12000 -// DISASM-NEXT: 11030: d0 0f 00 00 -// DISASM-NEXT: 11034: 04 c0 9f e5 ldr r12, [pc, #4] -// DISASM-NEXT: 11038: 0f c0 8c e0 add r12, r12, pc -// DISASM-NEXT: 1103c: 00 f0 9c e5 ldr pc, [r12] -// 0x0fcc + 0x11038 + 0x8 = 0x1200C -// DISASM-NEXT: 11040: cc 0f 00 00 -// DISASM-NEXT: 11044: 04 c0 9f e5 ldr r12, [pc, #4] -// DISASM-NEXT: 11048: 0f c0 8c e0 add r12, r12, pc -// DISASM-NEXT: 1104c: 00 f0 9c e5 ldr pc, [r12] -// 0x0fc0 + 0x11048 + 0x8 = 0x12010 -// DISASM-NEXT: 11050: c0 0f 00 00 +// DISASM-NEXT: 401020: 04 e0 2d e5 str lr, [sp, #-4]! +// DISASM-NEXT: 401024: 04 e0 9f e5 ldr lr, [pc, #4] +// DISASM-NEXT: 401028: 0e e0 8f e0 add lr, pc, lr +// DISASM-NEXT: 40102c: 08 f0 be e5 ldr pc, [lr, #8]! +// 0x0fd0 + 0x401028 + 0x8 = 0x402000 +// DISASM-NEXT: 401030: d0 0f 00 00 +// DISASM-NEXT: 401034: 04 c0 9f e5 ldr r12, [pc, #4] +// DISASM-NEXT: 401038: 0f c0 8c e0 add r12, r12, pc +// DISASM-NEXT: 40103c: 00 f0 9c e5 ldr pc, [r12] +// 0x0fcc + 0x401038 + 0x8 = 0x40200C +// DISASM-NEXT: 401040: cc 0f 00 00 +// DISASM-NEXT: 401044: 04 c0 9f e5 ldr r12, [pc, #4] +// DISASM-NEXT: 401048: 0f c0 8c e0 add r12, r12, pc +// DISASM-NEXT: 40104c: 00 f0 9c e5 ldr pc, [r12] +// 0x0fc0 + 0x401048 + 0x8 = 0x402010 +// DISASM-NEXT: 401050: c0 0f 00 00 Index: test/ELF/arm-gotoff.s =================================================================== --- test/ELF/arm-gotoff.s +++ test/ELF/arm-gotoff.s @@ -12,7 +12,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x12000 +// CHECK-NEXT: Address: 0x402000 // CHECK-NEXT: Offset: 0x2000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Link: @@ -25,7 +25,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x12000 +// CHECK-NEXT: Address: 0x402000 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 20 // CHECK-NEXT: Link: @@ -36,7 +36,7 @@ // CHECK: Symbol { // CHECK: Name: bar -// CHECK-NEXT: Value: 0x12000 +// CHECK-NEXT: Value: 0x402000 // CHECK-NEXT: Size: 10 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object @@ -45,7 +45,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: obj -// CHECK-NEXT: Value: 0x1200A +// CHECK-NEXT: Value: 0x40200A // CHECK-NEXT: Size: 10 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object @@ -54,13 +54,13 @@ // DISASM: Disassembly of section .text: // DISASM-NEXT :_start: -// DISASM-NEXT 11000: 1e ff 2f e1 bx lr +// DISASM-NEXT 401000: 1e ff 2f e1 bx lr // Offset 0 from .got = bar -// DISASM 11004: 00 00 00 00 +// DISASM 401004: 00 00 00 00 // Offset 10 from .got = obj -// DISASM-NEXT 11008: 0a 00 00 00 +// DISASM-NEXT 401008: 0a 00 00 00 // Offset 15 from .got = obj +5 -// DISASM-NEXT 1100c: 0f 00 00 00 +// DISASM-NEXT 40100c: 0f 00 00 00 .syntax unified .globl _start _start: Index: test/ELF/arm-mov-relocs.s =================================================================== --- test/ELF/arm-mov-relocs.s +++ test/ELF/arm-mov-relocs.s @@ -47,16 +47,16 @@ movw r2, :lower16:label2 + 4 - . movw r3, :lower16:label3 - . movw r4, :lower16:label3 + 0x103c - . -// 0x20000 - 0x11028 = :lower16:0xefd8 (61400) -// CHECK: 11028: {{.*}} movw r0, #61400 -// 0x20004 = 0x1102c = :lower16:0xefd8 (61400) -// CHECK: 1102c: {{.*}} movw r1, #61400 -// 0x20008 - 0x11030 + 4 = :lower16:0xefdc (61404) -// CHECK: 11030: {{.*}} movw r2, #61404 -// 0x2fffc - 0x11034 = :lower16:0x1efc8 (61384) -// CHECK: 11034: {{.*}} movw r3, #61384 -// 0x2fffc - 0x11038 +0x103c :lower16:0x20000 (0) -// CHECK: 11038: {{.*}} movw r4, #0 +// 0x20000 - 0x401028 = :lower16:0xefd8 (61400) +// CHECK: 401028: {{.*}} movw r0, #61400 +// 0x20004 = 0x40102c = :lower16:0xefd8 (61400) +// CHECK: 40102c: {{.*}} movw r1, #61400 +// 0x20008 - 0x401030 + 4 = :lower16:0xefdc (61404) +// CHECK: 401030: {{.*}} movw r2, #61404 +// 0x2fffc - 0x401034 = :lower16:0x40efc8 (61384) +// CHECK: 401034: {{.*}} movw r3, #61384 +// 0x2fffc - 0x401038 +0x103c :lower16:0x20000 (0) +// CHECK: 401038: {{.*}} movw r4, #0 .section .R_ARM_MOVT_PREL, "ax",%progbits movt r0, :upper16:label - . @@ -64,16 +64,16 @@ movt r2, :upper16:label2 + 0x4 - . movt r3, :upper16:label3 - . movt r4, :upper16:label3 + 0x1050 - . -// 0x20000 - 0x1103c = :upper16:0xefc4 = 0 -// CHECK: 1103c: {{.*}} movt r0, #0 -// 0x20004 - 0x11040 = :upper16:0xefc0 = 0 -// CHECK: 11040: {{.*}} movt r1, #0 -// 0x20008 - 0x11044 + 4 = :upper16:0xefc8 = 0 -// CHECK: 11044: {{.*}} movt r2, #0 -// 0x2fffc - 0x11048 = :upper16:0x1efb4 = 1 -// CHECK: 11048: {{.*}} movt r3, #1 -// 0x2fffc - 0x1104c + 0x1050 = :upper16:0x20000 = 2 -// CHECK: 1104c: {{.*}} movt r4, #2 +// 0x20000 - 0x40103c = :upper16:0xefc4 = 0 +// CHECK: 40103c: {{.*}} movt r0, #0 +// 0x20004 - 0x401040 = :upper16:0xefc0 = 0 +// CHECK: 401040: {{.*}} movt r1, #0 +// 0x20008 - 0x401044 + 4 = :upper16:0xefc8 = 0 +// CHECK: 401044: {{.*}} movt r2, #0 +// 0x2fffc - 0x401048 = :upper16:0x40efb4 = 1 +// CHECK: 401048: {{.*}} movt r3, #1 +// 0x2fffc - 0x40104c + 0x1050 = :upper16:0x20000 = 2 +// CHECK: 40104c: {{.*}} movt r4, #2 .section .destination, "aw",%progbits .balign 65536 // 0x20000 Index: test/ELF/arm-plt-reloc.s =================================================================== --- test/ELF/arm-plt-reloc.s +++ test/ELF/arm-plt-reloc.s @@ -21,15 +21,15 @@ // Executable, expect no PLT // CHECK: Disassembly of section .text: // CHECK-NEXT: func1: -// CHECK-NEXT: 11000: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401000: 1e ff 2f e1 bx lr // CHECK: func2: -// CHECK-NEXT: 11004: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401004: 1e ff 2f e1 bx lr // CHECK: func3: -// CHECK-NEXT: 11008: 1e ff 2f e1 bx lr +// CHECK-NEXT: 401008: 1e ff 2f e1 bx lr // CHECK: _start: -// CHECK-NEXT: 1100c: fb ff ff ea b #-20 -// CHECK-NEXT: 11010: fb ff ff eb bl #-20 -// CHECK-NEXT: 11014: fb ff ff 0a beq #-20 +// CHECK-NEXT: 40100c: fb ff ff ea b #-20 +// CHECK-NEXT: 401010: fb ff ff eb bl #-20 +// CHECK-NEXT: 401014: fb ff ff 0a beq #-20 // Expect PLT entries as symbols can be preempted // DSO: Disassembly of section .text: Index: test/ELF/arm-static-defines.s =================================================================== --- test/ELF/arm-static-defines.s +++ test/ELF/arm-static-defines.s @@ -23,7 +23,7 @@ .fnend // CHECK: Name: __exidx_end -// CHECK-NEXT: Value: 0x100DC +// CHECK-NEXT: Value: 0x4000DC // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -32,7 +32,7 @@ // CHECK-NEXT: ] // CHECK-NEXT: Section: .ARM.exidx // CHECK: Name: __exidx_start -// CHECK-NEXT: Value: 0x100D4 +// CHECK-NEXT: Value: 0x4000D4 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None Index: test/ELF/arm-target2.s =================================================================== --- test/ELF/arm-target2.s +++ test/ELF/arm-target2.s @@ -35,26 +35,26 @@ _ZTIi: .word 0 // CHECK: Contents of section .ARM.extab: -// 1011c + 1ee4 = 12000 = .got -// CHECK-NEXT: 10114 f00e0000 b0b0b000 e41e0000 +// 40011c + 1ee4 = 402000 = .got +// CHECK-NEXT: 400114 f00e0000 b0b0b000 e41e0000 // CHECK-ABS: Contents of section .ARM.extab: -// 100e8 = .rodata -// CHECK-ABS-NEXT: 100d4 300f0000 b0b0b000 e8000100 +// 4000e8 = .rodata +// CHECK-ABS-NEXT: 4000d4 300f0000 b0b0b000 e8000100 // CHECK-REL: Contents of section .ARM.extab: -// 100dc + c = 100e8 = .rodata -// CHECK-REL-NEXT: 100d4 300f0000 b0b0b000 0c000000 +// 4000dc + c = 4000e8 = .rodata +// CHECK-REL-NEXT: 4000d4 300f0000 b0b0b000 0c000000 // CHECK: Contents of section .rodata: -// CHECK-NEXT: 10128 00000000 +// CHECK-NEXT: 400128 00000000 // CHECK-ABS: Contents of section .rodata: -// CHECK-ABS-NEXT: 100e8 00000000 +// CHECK-ABS-NEXT: 4000e8 00000000 // CHECK-REL: Contents of section .rodata: -// CHECK-REL-NEXT: 100e8 00000000 +// CHECK-REL-NEXT: 4000e8 00000000 // CHECK: Contents of section .got: -// 10128 = _ZTIi -// CHECK-NEXT: 12000 28010100 +// 400128 = _ZTIi +// CHECK-NEXT: 402000 28010100 Index: test/ELF/arm-thumb-blx.s =================================================================== --- test/ELF/arm-thumb-blx.s +++ test/ELF/arm-thumb-blx.s @@ -19,7 +19,7 @@ .section .text, "ax",%progbits .thumb .globl _start - .balign 0x10000 + .balign 0x400000 .type _start,%function _start: blx callee_low @@ -50,36 +50,36 @@ // CHECK-THUMB: Disassembly of section .caller: // CHECK-THUMB: _start: -// Align(0x10000,4) - 0xff50 (65360) + 4 = 0xb4 = callee_low -// CHECK-NEXT-THUMB: 10000: f0 f7 58 e8 blx #-65360 -// CHECK-NEXT-THUMB: 10004: 00 bf nop -// Align(0x10006,4) - 0xff54 (65364) + 4 = 0xb4 = callee_low -// CHECK-NEXT-THUMB: 10006: f0 f7 56 e8 blx #-65364 -// CHECK-NEXT-THUMB: 1000a: 00 bf nop -// Align(0x1000c,4) + 0xf0 (240) + 4 = 0x10100 = callee_high -// CHECK-NEXT-THUMB: 1000c: 00 f0 78 e8 blx #240 -// CHECK-NEXT-THUMB: 10010: 00 bf nop -// Align(0x10012,4) + 0xec (236) + 4 = 0x10100 = callee_high -// CHECK-NEXT-THUMB: 10012: 00 f0 76 e8 blx #236 -// CHECK-NEXT-THUMB: 10016: 00 bf nop -// Align(0x10018,4) + 0xfffffc (16777212) = 0x1010018 = blx_far -// CHECK-NEXT-THUMB: 10018: ff f3 fe c7 blx #16777212 -// CHECK-NEXT-THUMB: 1001c: 00 bf nop -// Align(0x1001e,4) + 0xfffff8 (16777208) = 0x1010018 = blx_far -// CHECK-NEXT-THUMB: 1001e: ff f3 fc c7 blx #16777208 -// CHECK-NEXT-THUMB: 10022: 00 bf nop -// 10024 - 0xff28 (65320) + 4 = 0x100 = callee_thumb_low -// CHECK-NEXT-THUMB: 10024: f0 f7 6c f8 bl #-65320 -// CHECK-NEXT-THUMB: 10028: 00 bf nop -// 1002a + 0x1d2 (466) + 4 = 0x10200 = callee_thumb_high -// CHECK-NEXT-THUMB: 1002a: 00 f0 e9 f8 bl #466 -// CHECK-NEXT-THUMB: 1002e: 70 47 bx lr +// Align(0x400000,4) - 0xff50 (65360) + 4 = 0xb4 = callee_low +// CHECK-NEXT-THUMB: 400000: f0 f7 58 e8 blx #-65360 +// CHECK-NEXT-THUMB: 400004: 00 bf nop +// Align(0x400006,4) - 0xff54 (65364) + 4 = 0xb4 = callee_low +// CHECK-NEXT-THUMB: 400006: f0 f7 56 e8 blx #-65364 +// CHECK-NEXT-THUMB: 40000a: 00 bf nop +// Align(0x40000c,4) + 0xf0 (240) + 4 = 0x400100 = callee_high +// CHECK-NEXT-THUMB: 40000c: 00 f0 78 e8 blx #240 +// CHECK-NEXT-THUMB: 400010: 00 bf nop +// Align(0x400012,4) + 0xec (236) + 4 = 0x400100 = callee_high +// CHECK-NEXT-THUMB: 400012: 00 f0 76 e8 blx #236 +// CHECK-NEXT-THUMB: 400016: 00 bf nop +// Align(0x400018,4) + 0xfffffc (16777212) = 0x1010018 = blx_far +// CHECK-NEXT-THUMB: 400018: ff f3 fe c7 blx #16777212 +// CHECK-NEXT-THUMB: 40001c: 00 bf nop +// Align(0x40001e,4) + 0xfffff8 (16777208) = 0x1010018 = blx_far +// CHECK-NEXT-THUMB: 40001e: ff f3 fc c7 blx #16777208 +// CHECK-NEXT-THUMB: 400022: 00 bf nop +// 400024 - 0xff28 (65320) + 4 = 0x100 = callee_thumb_low +// CHECK-NEXT-THUMB: 400024: f0 f7 6c f8 bl #-65320 +// CHECK-NEXT-THUMB: 400028: 00 bf nop +// 40002a + 0x1d2 (466) + 4 = 0x400200 = callee_thumb_high +// CHECK-NEXT-THUMB: 40002a: 00 f0 e9 f8 bl #466 +// CHECK-NEXT-THUMB: 40002e: 70 47 bx lr // CHECK-ARM: Disassembly of section .R_ARM_CALL24_callee3: // CHECK-NEXT-ARM: callee_high: -// CHECK-NEXT-ARM: 10100: 1e ff 2f e1 bx lr +// CHECK-NEXT-ARM: 400100: 1e ff 2f e1 bx lr // CHECK: Disassembly of section .R_ARM_CALL24_callee4: // CHECK-NEXT-THUMB:callee_thumb_high: -// CHECK-NEXT-THUMB: 10200: 70 47 bx lr +// CHECK-NEXT-THUMB: 400200: 70 47 bx lr Index: test/ELF/arm-thumb-branch-error.s =================================================================== --- test/ELF/arm-thumb-branch-error.s +++ test/ELF/arm-thumb-branch-error.s @@ -5,7 +5,7 @@ .syntax unified .section .text, "ax",%progbits .globl _start - .balign 0x10000 + .balign 0x400000 .type _start,%function _start: // address of too_far symbols are just out of range of ARM branch with Index: test/ELF/arm-thumb-branch.s =================================================================== --- test/ELF/arm-thumb-branch.s +++ test/ELF/arm-thumb-branch.s @@ -19,7 +19,7 @@ .section .text, "ax",%progbits .globl _start - .balign 0x10000 + .balign 0x400000 .type _start,%function _start: bl callee_low @@ -44,17 +44,17 @@ // CHECK-NEXT: b4: 70 47 bx lr // CHECK-NEXT: Disassembly of section .caller: // CHECK-NEXT: _start: -// CHECK-NEXT: 10000: f0 f7 58 f8 bl #-65360 -// CHECK-NEXT: 10004: f0 f7 56 b8 b.w #-65364 -// CHECK-NEXT: 10008: 30 f4 54 a8 beq.w #-65368 -// CHECK-NEXT: 1000c: 00 f0 0c f8 bl #24 -// CHECK-NEXT: 10010: 00 f0 0a b8 b.w #20 -// CHECK-NEXT: 10014: 40 f0 08 80 bne.w #16 -// CHECK-NEXT: 10018: ff f3 ff d7 bl #16777214 -// CHECK-NEXT: 1001c: ff f3 fd 97 b.w #16777210 -// CHECK-NEXT: 10020: 3f f3 ff af bgt.w #1048574 -// CHECK-NEXT: 10024: 70 47 bx lr -// CHECK-NEXT: 10026: 00 00 movs r0, r0 +// CHECK-NEXT: 400000: f0 f7 58 f8 bl #-65360 +// CHECK-NEXT: 400004: f0 f7 56 b8 b.w #-65364 +// CHECK-NEXT: 400008: 30 f4 54 a8 beq.w #-65368 +// CHECK-NEXT: 40000c: 00 f0 0c f8 bl #24 +// CHECK-NEXT: 400010: 00 f0 0a b8 b.w #20 +// CHECK-NEXT: 400014: 40 f0 08 80 bne.w #16 +// CHECK-NEXT: 400018: ff f3 ff d7 bl #16777214 +// CHECK-NEXT: 40001c: ff f3 fd 97 b.w #16777210 +// CHECK-NEXT: 400020: 3f f3 ff af bgt.w #1048574 +// CHECK-NEXT: 400024: 70 47 bx lr +// CHECK-NEXT: 400026: 00 00 movs r0, r0 // CHECK-NEXT: Disassembly of section .callee2: // CHECK-NEXT: callee_high: -// CHECK-NEXT: 10028: 70 47 bx lr +// CHECK-NEXT: 400028: 70 47 bx lr Index: test/ELF/arm-thumb-no-undefined-thunk.s =================================================================== --- test/ELF/arm-thumb-no-undefined-thunk.s +++ test/ELF/arm-thumb-no-undefined-thunk.s @@ -18,7 +18,7 @@ // CHECK: Disassembly of section .text: // CHECK-NEXT: _start: -// 69636 = 0x11004 = next instruction -// CHECK: 11000: 11 f0 02 f8 bl #69636 -// CHECK-NEXT: 11004: 11 f0 04 b8 b.w #69640 -// CHECK-NEXT: 11008: 11 f0 06 b8 b.w #69644 +// 69636 = 0x401004 = next instruction +// CHECK: 401000: 11 f0 02 f8 bl #69636 +// CHECK-NEXT: 401004: 11 f0 04 b8 b.w #69640 +// CHECK-NEXT: 401008: 11 f0 06 b8 b.w #69644 Index: test/ELF/arm-thumb-plt-reloc.s =================================================================== --- test/ELF/arm-thumb-plt-reloc.s +++ test/ELF/arm-thumb-plt-reloc.s @@ -25,19 +25,19 @@ // Executable, expect no PLT // CHECK: Disassembly of section .text: // CHECK-NEXT: func1: -// CHECK-NEXT: 11000: 70 47 bx lr +// CHECK-NEXT: 401000: 70 47 bx lr // CHECK: func2: -// CHECK-NEXT: 11002: 70 47 bx lr +// CHECK-NEXT: 401002: 70 47 bx lr // CHECK: func3: -// CHECK-NEXT: 11004: 70 47 bx lr -// CHECK-NEXT: 11006: 00 00 movs r0, r0 +// CHECK-NEXT: 401004: 70 47 bx lr +// CHECK-NEXT: 401006: 00 00 movs r0, r0 // CHECK: _start: -// 11008 + 4 -12 = 0x11000 = func1 -// CHECK-NEXT: 11008: ff f7 fa ff bl #-12 -// 1100c + 4 -14 = 0x11002 = func2 -// CHECK-NEXT: 1100c: ff f7 f9 ff bl #-14 -// 11010 + 4 -16 = 0x11004 = func3 -// CHECK-NEXT: 11010: ff f7 f8 ff bl #-16 +// 401008 + 4 -12 = 0x401000 = func1 +// CHECK-NEXT: 401008: ff f7 fa ff bl #-12 +// 40100c + 4 -14 = 0x401002 = func2 +// CHECK-NEXT: 40100c: ff f7 f9 ff bl #-14 +// 401010 + 4 -16 = 0x401004 = func3 +// CHECK-NEXT: 401010: ff f7 f8 ff bl #-16 // Expect PLT entries as symbols can be preempted // .text is Thumb and .plt is ARM, llvm-objdump can currently only disassemble Index: test/ELF/arm-thumb-undefined-weak.s =================================================================== --- test/ELF/arm-thumb-undefined-weak.s +++ test/ELF/arm-thumb-undefined-weak.s @@ -28,11 +28,11 @@ movw r0, :lower16:target - . // CHECK: Disassembly of section .text: -// 69636 = 0x11004 -// CHECK: 11000: 11 f0 02 80 beq.w #69636 -// CHECK-NEXT: 11004: 11 f0 04 b8 b.w #69640 -// CHECK-NEXT: 11008: 11 f0 06 f8 bl #69644 +// 69636 = 0x401004 +// CHECK: 401000: 11 f0 02 80 beq.w #69636 +// CHECK-NEXT: 401004: 11 f0 04 b8 b.w #69640 +// CHECK-NEXT: 401008: 11 f0 06 f8 bl #69644 // blx is transformed into bl so we don't change state -// CHECK-NEXT: 1100c: 11 f0 08 f8 bl #69648 -// CHECK-NEXT: 11010: c0 f2 00 00 movt r0, #0 -// CHECK-NEXT: 11014: 40 f2 00 00 movw r0, #0 +// CHECK-NEXT: 40100c: 11 f0 08 f8 bl #69648 +// CHECK-NEXT: 401010: c0 f2 00 00 movt r0, #0 +// CHECK-NEXT: 401014: 40 f2 00 00 movw r0, #0 Index: test/ELF/arm-tls-ldm32.s =================================================================== --- test/ELF/arm-tls-ldm32.s +++ test/ELF/arm-tls-ldm32.s @@ -66,8 +66,8 @@ // CHECK-EXE: Disassembly of section .text: // CHECK-NEXT-EXE: _start: -// CHECK-NEXT-EXE: 11000: 00 f0 20 e3 nop +// CHECK-NEXT-EXE: 401000: 00 f0 20 e3 nop -// CHECK-EXE: 11004: fc 0f 00 00 -// CHECK-EXE: 11008: 00 00 00 00 -// CHECK-EXE: 1100c: 04 00 00 00 +// CHECK-EXE: 401004: fc 0f 00 00 +// CHECK-EXE: 401008: 00 00 00 00 +// CHECK-EXE: 40100c: 04 00 00 00 Index: test/ELF/arm-tls-le32.s =================================================================== --- test/ELF/arm-tls-le32.s +++ test/ELF/arm-tls-le32.s @@ -52,7 +52,7 @@ // SEC-NEXT: SHF_TLS // SEC-NEXT: SHF_WRITE // SEC-NEXT: ] -// SEC-NEXT: Address: 0x12000 +// SEC-NEXT: Address: 0x402000 // SEC: Size: 4 // SEC: Name: .tbss // SEC-NEXT: Type: SHT_NOBITS @@ -61,7 +61,7 @@ // SEC-NEXT: SHF_TLS // SEC-NEXT: SHF_WRITE // SEC-NEXT: ] -// SEC-NEXT: Address: 0x12004 +// SEC-NEXT: Address: 0x402004 // SEC: Size: 8 // SEC: Dynamic Relocations { @@ -70,8 +70,8 @@ // CHECK: Disassembly of section .text: // CHECK-NEXT: _start: // offset of x from Thread pointer = (TcbSize + 0x0 = 0x8) -// CHECK-NEXT: 11000: 08 00 00 00 +// CHECK-NEXT: 401000: 08 00 00 00 // offset of z from Thread pointer = (TcbSize + 0x8 = 0x10) -// CHECK-NEXT: 11004: 10 00 00 00 +// CHECK-NEXT: 401004: 10 00 00 00 // offset of y from Thread pointer = (TcbSize + 0x4 = 0xc) -// CHECK-NEXT: 11008: 0c 00 00 00 +// CHECK-NEXT: 401008: 0c 00 00 00 Index: test/ELF/arm-tls-norelax-gd-ie.s =================================================================== --- test/ELF/arm-tls-norelax-gd-ie.s +++ test/ELF/arm-tls-norelax-gd-ie.s @@ -25,6 +25,6 @@ .Lt0: .word y(TLSGD) + (. - .L0 - 8) // CHECK: Dynamic Relocations { -// CHECK-NEXT: 0x12078 R_ARM_TLS_DTPMOD32 y -// CHECK-NEXT: 0x1207C R_ARM_TLS_DTPOFF32 y -// CHECK-NEXT: 0x1300C R_ARM_JUMP_SLOT __tls_get_addr +// CHECK-NEXT: 0x402078 R_ARM_TLS_DTPMOD32 y +// CHECK-NEXT: 0x40207C R_ARM_TLS_DTPOFF32 y +// CHECK-NEXT: 0x40300C R_ARM_JUMP_SLOT __tls_get_addr Index: test/ELF/arm-tls-norelax-gd-le.s =================================================================== --- test/ELF/arm-tls-norelax-gd-le.s +++ test/ELF/arm-tls-norelax-gd-le.s @@ -32,6 +32,6 @@ .type x, %object // CHECK: Dynamic Relocations { -// CHECK-NEXT: 0x12078 R_ARM_TLS_DTPMOD32 -// CHECK-NEXT: 0x1300C R_ARM_JUMP_SLOT __tls_get_addr +// CHECK-NEXT: 0x402078 R_ARM_TLS_DTPMOD32 +// CHECK-NEXT: 0x40300C R_ARM_JUMP_SLOT __tls_get_addr Index: test/ELF/arm-tls-norelax-ie-le.s =================================================================== --- test/ELF/arm-tls-norelax-ie-le.s +++ test/ELF/arm-tls-norelax-ie-le.s @@ -38,4 +38,4 @@ // CHECK: Contents of section .got // x1 at offset 0 from TP, x2 at offset 4 from TP -// 12064 00000000 04000000 +// 402064 00000000 04000000 Index: test/ELF/arm-tls-norelax-ld-le.s =================================================================== --- test/ELF/arm-tls-norelax-ld-le.s +++ test/ELF/arm-tls-norelax-ld-le.s @@ -32,5 +32,5 @@ .word 10 // CHECK: Dynamic Relocations { -// CHECK-NEXT: 0x1207C R_ARM_TLS_DTPMOD32 - 0x0 -// CHECK-NEXT: 0x1300C R_ARM_JUMP_SLOT __tls_get_addr 0x0 +// CHECK-NEXT: 0x40207C R_ARM_TLS_DTPMOD32 - 0x0 +// CHECK-NEXT: 0x40300C R_ARM_JUMP_SLOT __tls_get_addr 0x0 Index: test/ELF/arm-undefined-weak.s =================================================================== --- test/ELF/arm-undefined-weak.s +++ test/ELF/arm-undefined-weak.s @@ -28,12 +28,12 @@ .word target - . // CHECK: Disassembly of section .text: -// 69636 = 0x11004 -// CHECK: 11000: 01 44 00 ea b #69636 -// CHECK-NEXT: 11004: 02 44 00 eb bl #69640 +// 69636 = 0x401004 +// CHECK: 401000: 01 44 00 ea b #69636 +// CHECK-NEXT: 401004: 02 44 00 eb bl #69640 // blx is transformed into bl so we don't change state -// CHECK-NEXT: 11008: 03 44 00 eb bl #69644 -// CHECK-NEXT: 1100c: 00 00 40 e3 movt r0, #0 -// CHECK-NEXT: 11010: 00 00 00 e3 movw r0, #0 -// CHECK: 11014: 00 00 00 00 .word 0x00000000 +// CHECK-NEXT: 401008: 03 44 00 eb bl #69644 +// CHECK-NEXT: 40100c: 00 00 40 e3 movt r0, #0 +// CHECK-NEXT: 401010: 00 00 00 e3 movw r0, #0 +// CHECK: 401014: 00 00 00 00 .word 0x00000000 Index: test/ELF/avoid-empty-program-headers.s =================================================================== --- test/ELF/avoid-empty-program-headers.s +++ test/ELF/avoid-empty-program-headers.s @@ -16,8 +16,8 @@ // CHECK-NEXT: ProgramHeader { // CHECK-NEXT: Type: PT_PHDR (0x6) // CHECK-NEXT: Offset: 0x40 -// CHECK-NEXT: VirtualAddress: 0x10040 -// CHECK-NEXT: PhysicalAddress: 0x10040 +// CHECK-NEXT: VirtualAddress: 0x400040 +// CHECK-NEXT: PhysicalAddress: 0x400040 // CHECK-NEXT: FileSize: 280 // CHECK-NEXT: MemSize: 280 // CHECK-NEXT: Flags [ (0x4) @@ -28,8 +28,8 @@ // CHECK-NEXT: ProgramHeader { // CHECK-NEXT: Type: PT_LOAD (0x1) // CHECK-NEXT: Offset: 0x0 -// CHECK-NEXT: VirtualAddress: 0x10000 -// CHECK-NEXT: PhysicalAddress: 0x10000 +// CHECK-NEXT: VirtualAddress: 0x400000 +// CHECK-NEXT: PhysicalAddress: 0x400000 // CHECK-NEXT: FileSize: 344 // CHECK-NEXT: MemSize: 344 // CHECK-NEXT: Flags [ (0x4) @@ -40,8 +40,8 @@ // CHECK-NEXT: ProgramHeader { // CHECK-NEXT: Type: PT_LOAD (0x1) // CHECK-NEXT: Offset: 0x1000 -// CHECK-NEXT: VirtualAddress: 0x11000 -// CHECK-NEXT: PhysicalAddress: 0x11000 +// CHECK-NEXT: VirtualAddress: 0x401000 +// CHECK-NEXT: PhysicalAddress: 0x401000 // CHECK-NEXT: FileSize: 1 // CHECK-NEXT: MemSize: 1 // CHECK-NEXT: Flags [ (0x5) @@ -53,8 +53,8 @@ // CHECK-NEXT: ProgramHeader { // CHECK-NEXT: Type: PT_TLS (0x7) // CHECK-NEXT: Offset: 0x1001 -// CHECK-NEXT: VirtualAddress: 0x11001 -// CHECK-NEXT: PhysicalAddress: 0x11001 +// CHECK-NEXT: VirtualAddress: 0x401001 +// CHECK-NEXT: PhysicalAddress: 0x401001 // CHECK-NEXT: FileSize: 0 // CHECK-NEXT: MemSize: 4 // CHECK-NEXT: Flags [ (0x4) Index: test/ELF/basic-aarch64.s =================================================================== --- test/ELF/basic-aarch64.s +++ test/ELF/basic-aarch64.s @@ -26,7 +26,7 @@ # CHECK-NEXT: Version: 1 # CHECK-NEXT: Entry: [[ENTRY:0x[0-9A-F]+]] # CHECK-NEXT: ProgramHeaderOffset: 0x40 -# CHECK-NEXT: SectionHeaderOffset: 0x10098 +# CHECK-NEXT: SectionHeaderOffset: 0x400098 # CHECK-NEXT: Flags [ (0x0) # CHECK-NEXT: ] # CHECK-NEXT: HeaderSize: 64 @@ -60,7 +60,7 @@ # CHECK-NEXT: SHF_EXECINSTR (0x4) # CHECK-NEXT: ] # CHECK-NEXT: Address: 0x20000 -# CHECK-NEXT: Offset: 0x10000 +# CHECK-NEXT: Offset: 0x400000 # CHECK-NEXT: Size: 12 # CHECK-NEXT: Link: 0 # CHECK-NEXT: Info: 0 @@ -76,7 +76,7 @@ # CHECK-NEXT: SHF_STRINGS (0x20) # CHECK-NEXT: ] # CHECK-NEXT: Address: 0x0 -# CHECK-NEXT: Offset: 0x1000C +# CHECK-NEXT: Offset: 0x40000C # CHECK-NEXT: Size: 8 # CHECK-NEXT: Link: 0 # CHECK-NEXT: Info: 0 @@ -90,7 +90,7 @@ # CHECK-NEXT: Flags [ (0x0) # CHECK-NEXT: ] # CHECK-NEXT: Address: 0x0 -# CHECK-NEXT: Offset: 0x10018 +# CHECK-NEXT: Offset: 0x400018 # CHECK-NEXT: Size: 72 # CHECK-NEXT: Link: 5 # CHECK-NEXT: Info: 2 @@ -104,7 +104,7 @@ # CHECK-NEXT: Flags [ (0x0) # CHECK-NEXT: ] # CHECK-NEXT: Address: 0x0 -# CHECK-NEXT: Offset: 0x10060 +# CHECK-NEXT: Offset: 0x400060 # CHECK-NEXT: Size: 42 # CHECK-NEXT: Link: 0 # CHECK-NEXT: Info: 0 @@ -118,7 +118,7 @@ # CHECK-NEXT: Flags [ (0x0) # CHECK-NEXT: ] # CHECK-NEXT: Address: 0x0 -# CHECK-NEXT: Offset: 0x1008A +# CHECK-NEXT: Offset: 0x40008A # CHECK-NEXT: Size: 13 # CHECK-NEXT: Link: 0 # CHECK-NEXT: Info: 0 @@ -159,8 +159,8 @@ # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_PHDR (0x6) # CHECK-NEXT: Offset: 0x40 -# CHECK-NEXT: VirtualAddress: 0x10040 -# CHECK-NEXT: PhysicalAddress: 0x10040 +# CHECK-NEXT: VirtualAddress: 0x400040 +# CHECK-NEXT: PhysicalAddress: 0x400040 # CHECK-NEXT: FileSize: 224 # CHECK-NEXT: MemSize: 224 # CHECK-NEXT: Flags [ (0x4) @@ -171,8 +171,8 @@ # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_LOAD (0x1) # CHECK-NEXT: Offset: 0x0 -# CHECK-NEXT: VirtualAddress: 0x10000 -# CHECK-NEXT: PhysicalAddress: 0x10000 +# CHECK-NEXT: VirtualAddress: 0x400000 +# CHECK-NEXT: PhysicalAddress: 0x400000 # CHECK-NEXT: FileSize: 288 # CHECK-NEXT: MemSize: 288 # CHECK-NEXT: Flags [ Index: test/ELF/basic-mips.s =================================================================== --- test/ELF/basic-mips.s +++ test/ELF/basic-mips.s @@ -62,7 +62,7 @@ # CHECK-NEXT: Flags [ (0x2) # CHECK-NEXT: SHF_ALLOC (0x2) # CHECK-NEXT: ] -# CHECK-NEXT: Address: 0x100F8 +# CHECK-NEXT: Address: 0x4000F8 # CHECK-NEXT: Offset: 0xF8 # CHECK-NEXT: Size: 24 # CHECK-NEXT: Link: 0 @@ -77,7 +77,7 @@ # CHECK-NEXT: Flags [ (0x2) # CHECK-NEXT: SHF_ALLOC (0x2) # CHECK-NEXT: ] -# CHECK-NEXT: Address: 0x10110 +# CHECK-NEXT: Address: 0x400110 # CHECK-NEXT: Offset: 0x110 # CHECK-NEXT: Size: 24 # CHECK-NEXT: Link: 0 @@ -94,7 +94,7 @@ # CHECK-NEXT: SHF_EXECINSTR (0x4) # CHECK-NEXT: ] # CHECK-NEXT: Address: 0x20000 -# CHECK-NEXT: Offset: 0x10000 +# CHECK-NEXT: Offset: 0x400000 # CHECK-NEXT: Size: 12 # CHECK-NEXT: Link: 0 # CHECK-NEXT: Info: 0 @@ -244,8 +244,8 @@ # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_PHDR (0x6) # CHECK-NEXT: Offset: 0x34 -# CHECK-NEXT: VirtualAddress: 0x10034 -# CHECK-NEXT: PhysicalAddress: 0x10034 +# CHECK-NEXT: VirtualAddress: 0x400034 +# CHECK-NEXT: PhysicalAddress: 0x400034 # CHECK-NEXT: FileSize: 192 # CHECK-NEXT: MemSize: 192 # CHECK-NEXT: Flags [ (0x4) @@ -256,8 +256,8 @@ # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_LOAD (0x1) # CHECK-NEXT: Offset: 0x0 -# CHECK-NEXT: VirtualAddress: 0x10000 -# CHECK-NEXT: PhysicalAddress: 0x10000 +# CHECK-NEXT: VirtualAddress: 0x400000 +# CHECK-NEXT: PhysicalAddress: 0x400000 # CHECK-NEXT: FileSize: 296 # CHECK-NEXT: MemSize: 296 # CHECK-NEXT: Flags [ (0x4) @@ -267,7 +267,7 @@ # CHECK-NEXT: } # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_LOAD (0x1) -# CHECK-NEXT: Offset: 0x10000 +# CHECK-NEXT: Offset: 0x400000 # CHECK-NEXT: VirtualAddress: 0x20000 # CHECK-NEXT: PhysicalAddress: 0x20000 # CHECK-NEXT: FileSize: 12 Index: test/ELF/basic.s =================================================================== --- test/ELF/basic.s +++ test/ELF/basic.s @@ -60,7 +60,7 @@ # CHECK-NEXT: SHF_ALLOC (0x2) # CHECK-NEXT: SHF_EXECINSTR (0x4) # CHECK-NEXT: ] -# CHECK-NEXT: Address: 0x11000 +# CHECK-NEXT: Address: 0x401000 # CHECK-NEXT: Offset: 0x1000 # CHECK-NEXT: Size: 16 # CHECK-NEXT: Link: 0 @@ -151,8 +151,8 @@ # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_PHDR (0x6) # CHECK-NEXT: Offset: 0x40 -# CHECK-NEXT: VirtualAddress: 0x10040 -# CHECK-NEXT: PhysicalAddress: 0x10040 +# CHECK-NEXT: VirtualAddress: 0x400040 +# CHECK-NEXT: PhysicalAddress: 0x400040 # CHECK-NEXT: FileSize: 224 # CHECK-NEXT: MemSize: 224 # CHECK-NEXT: Flags [ (0x4) @@ -163,8 +163,8 @@ # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_LOAD (0x1) # CHECK-NEXT: Offset: 0x0 -# CHECK-NEXT: VirtualAddress: 0x10000 -# CHECK-NEXT: PhysicalAddress: 0x10000 +# CHECK-NEXT: VirtualAddress: 0x400000 +# CHECK-NEXT: PhysicalAddress: 0x400000 # CHECK-NEXT: FileSize: 288 # CHECK-NEXT: MemSize: 288 # CHECK-NEXT: Flags [ @@ -175,8 +175,8 @@ # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_LOAD (0x1) # CHECK-NEXT: Offset: 0x1000 -# CHECK-NEXT: VirtualAddress: 0x11000 -# CHECK-NEXT: PhysicalAddress: 0x11000 +# CHECK-NEXT: VirtualAddress: 0x401000 +# CHECK-NEXT: PhysicalAddress: 0x401000 # CHECK-NEXT: FileSize: 16 # CHECK-NEXT: MemSize: 16 # CHECK-NEXT: Flags [ (0x5) Index: test/ELF/basic32.s =================================================================== --- test/ELF/basic32.s +++ test/ELF/basic32.s @@ -23,7 +23,7 @@ # CHECK-NEXT: Type: Executable (0x2) # CHECK-NEXT: Machine: EM_386 (0x3) # CHECK-NEXT: Version: 1 -# CHECK-NEXT: Entry: 0x11000 +# CHECK-NEXT: Entry: 0x401000 # CHECK-NEXT: ProgramHeaderOffset: 0x34 # CHECK-NEXT: SectionHeaderOffset: 0x1068 # CHECK-NEXT: Flags [ (0x0) @@ -58,7 +58,7 @@ # CHECK-NEXT: SHF_ALLOC (0x2) # CHECK-NEXT: SHF_EXECINSTR (0x4) # CHECK-NEXT: ] -# CHECK-NEXT: Address: 0x11000 +# CHECK-NEXT: Address: 0x401000 # CHECK-NEXT: Offset: 0x1000 # CHECK-NEXT: Size: 12 # CHECK-NEXT: Link: 0 @@ -129,8 +129,8 @@ # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_PHDR (0x6) # CHECK-NEXT: Offset: 0x34 -# CHECK-NEXT: VirtualAddress: 0x10034 -# CHECK-NEXT: PhysicalAddress: 0x10034 +# CHECK-NEXT: VirtualAddress: 0x400034 +# CHECK-NEXT: PhysicalAddress: 0x400034 # CHECK-NEXT: FileSize: 128 # CHECK-NEXT: MemSize: 128 # CHECK-NEXT: Flags [ (0x4) @@ -141,8 +141,8 @@ # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_LOAD (0x1) # CHECK-NEXT: Offset: 0x0 -# CHECK-NEXT: VirtualAddress: 0x10000 -# CHECK-NEXT: PhysicalAddress: 0x10000 +# CHECK-NEXT: VirtualAddress: 0x400000 +# CHECK-NEXT: PhysicalAddress: 0x400000 # CHECK-NEXT: FileSize: 180 # CHECK-NEXT: MemSize: 180 # CHECK-NEXT: Flags [ @@ -153,8 +153,8 @@ # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_LOAD (0x1) # CHECK-NEXT: Offset: 0x1000 -# CHECK-NEXT: VirtualAddress: 0x11000 -# CHECK-NEXT: PhysicalAddress: 0x11000 +# CHECK-NEXT: VirtualAddress: 0x401000 +# CHECK-NEXT: PhysicalAddress: 0x401000 # CHECK-NEXT: FileSize: 12 # CHECK-NEXT: MemSize: 12 # CHECK-NEXT: Flags [ (0x5) Index: test/ELF/basic64be.s =================================================================== --- test/ELF/basic64be.s +++ test/ELF/basic64be.s @@ -74,7 +74,7 @@ # CHECK-NEXT: SHF_EXECINSTR (0x4) # CHECK-NEXT: ] # CHECK-NEXT: Address: 0x10010000 -# CHECK-NEXT: Offset: 0x10000 +# CHECK-NEXT: Offset: 0x400000 # CHECK-NEXT: Size: 12 # CHECK-NEXT: Link: 0 # CHECK-NEXT: Info: 0 @@ -257,7 +257,7 @@ # CHECK-NEXT: } # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_LOAD (0x1) -# CHECK-NEXT: Offset: 0x10000 +# CHECK-NEXT: Offset: 0x400000 # CHECK-NEXT: VirtualAddress: 0x10010000 # CHECK-NEXT: PhysicalAddress: 0x10010000 # CHECK-NEXT: FileSize: 12 Index: test/ELF/bss.s =================================================================== --- test/ELF/bss.s +++ test/ELF/bss.s @@ -11,7 +11,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x11000 +// CHECK-NEXT: Address: 0x401000 // CHECK-NEXT: Offset: 0x1000 // CHECK-NEXT: Size: 4 // CHECK-NEXT: Link: 0 Index: test/ELF/common.s =================================================================== --- test/ELF/common.s +++ test/ELF/common.s @@ -10,7 +10,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x11000 +// CHECK-NEXT: Address: 0x401000 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 22 // CHECK-NEXT: Link: 0 @@ -18,7 +18,7 @@ // CHECK-NEXT: AddressAlignment: 16 // CHECK: Name: sym1 -// CHECK-NEXT: Value: 0x11004 +// CHECK-NEXT: Value: 0x401004 // CHECK-NEXT: Size: 8 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object @@ -26,7 +26,7 @@ // CHECK-NEXT: Section: .bss // CHECK: Name: sym2 -// CHECK-NEXT: Value: 0x1100C +// CHECK-NEXT: Value: 0x40100C // CHECK-NEXT: Size: 8 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object @@ -34,7 +34,7 @@ // CHECK-NEXT: Section: .bss // CHECK: Name: sym3 -// CHECK-NEXT: Value: 0x11014 +// CHECK-NEXT: Value: 0x401014 // CHECK-NEXT: Size: 2 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object @@ -42,7 +42,7 @@ // CHECK-NEXT: Section: .bss // CHECK: Name: sym4 -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 4 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object Index: test/ELF/discard-locals.s =================================================================== --- test/ELF/discard-locals.s +++ test/ELF/discard-locals.s @@ -40,7 +40,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _start -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None Index: test/ELF/dynamic-list.s =================================================================== --- test/ELF/dynamic-list.s +++ test/ELF/dynamic-list.s @@ -37,7 +37,7 @@ # CHECK-NEXT: } # CHECK-NEXT: Symbol { # CHECK-NEXT: Name: foo1@ -# CHECK-NEXT: Value: 0x11000 +# CHECK-NEXT: Value: 0x401000 # CHECK-NEXT: Size: 0 # CHECK-NEXT: Binding: Global (0x1) # CHECK-NEXT: Type: None (0x0) @@ -64,7 +64,7 @@ # CHECK2-NEXT: } # CHECK2-NEXT: Symbol { # CHECK2-NEXT: Name: foo1@ -# CHECK2-NEXT: Value: 0x11000 +# CHECK2-NEXT: Value: 0x401000 # CHECK2-NEXT: Size: 0 # CHECK2-NEXT: Binding: Global (0x1) # CHECK2-NEXT: Type: None (0x0) @@ -73,7 +73,7 @@ # CHECK2-NEXT: } # CHECK2-NEXT: Symbol { # CHECK2-NEXT: Name: foo2@ -# CHECK2-NEXT: Value: 0x11001 +# CHECK2-NEXT: Value: 0x401001 # CHECK2-NEXT: Size: 0 # CHECK2-NEXT: Binding: Global (0x1) # CHECK2-NEXT: Type: None (0x0) @@ -82,7 +82,7 @@ # CHECK2-NEXT: } # CHECK2-NEXT: Symbol { # CHECK2-NEXT: Name: foo31@ -# CHECK2-NEXT: Value: 0x11002 +# CHECK2-NEXT: Value: 0x401002 # CHECK2-NEXT: Size: 0 # CHECK2-NEXT: Binding: Global (0x1) # CHECK2-NEXT: Type: None (0x0) Index: test/ELF/dynamic-reloc-index.s =================================================================== --- test/ELF/dynamic-reloc-index.s +++ test/ELF/dynamic-reloc-index.s @@ -8,7 +8,7 @@ // CHECK: Relocations [ // CHECK-NEXT: Section ({{.*}}) .rela.plt { -// CHECK-NEXT: 0x13018 R_X86_64_JUMP_SLOT bar 0x0 +// CHECK-NEXT: 0x403018 R_X86_64_JUMP_SLOT bar 0x0 // CHECK-NEXT: } // CHECK-NEXT: ] Index: test/ELF/dynamic-reloc.s =================================================================== --- test/ELF/dynamic-reloc.s +++ test/ELF/dynamic-reloc.s @@ -28,12 +28,12 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_EXECINSTR // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x11000 +// CHECK-NEXT: Address: 0x401000 // CHECK: Relocations [ // CHECK-NEXT: Section ({{.*}}) .rela.plt { // CHECK-NEXT: Relocation { -// CHECK-NEXT: Offset: 0x13018 +// CHECK-NEXT: Offset: 0x403018 // CHECK-NEXT: Type: R_X86_64_JUMP_SLOT // CHECK-NEXT: Symbol: bar // CHECK-NEXT: Addend: 0x0 Index: test/ELF/eh-frame-hdr-abs-fde.s =================================================================== --- test/ELF/eh-frame-hdr-abs-fde.s +++ test/ELF/eh-frame-hdr-abs-fde.s @@ -9,10 +9,10 @@ # REQUIRES: mips # CHECK: Contents of section .eh_frame_hdr: -# CHECK-NEXT: 10178 011b033b ffffffcc 00000001 0000fe88 -# ^-- 0x20000 - 0x10178 +# CHECK-NEXT: 400178 011b033b ffffffcc 00000001 0000fe88 +# ^-- 0x20000 - 0x400178 # .text - .eh_frame_hdr -# CHECK-NEXT: 10188 ffffffe8 +# CHECK-NEXT: 400188 ffffffe8 # CHECK-NEXT: Contents of section .text: # CHECK-NEXT: 20000 00000000 Index: test/ELF/eh-frame-hdr-icf.s =================================================================== --- test/ELF/eh-frame-hdr-icf.s +++ test/ELF/eh-frame-hdr-icf.s @@ -5,9 +5,9 @@ # RUN: llvm-objdump -s %t2 | FileCheck %s # CHECK: Contents of section .eh_frame_hdr: -# CHECK-NEXT: 101a0 011b033b b4ffffff 01000000 600e0000 +# CHECK-NEXT: 4001a0 011b033b b4ffffff 01000000 600e0000 # ^ FDE count -# CHECK-NEXT: 101b0 d0ffffff 00000000 00000000 +# CHECK-NEXT: 4001b0 d0ffffff 00000000 00000000 # ^ FDE for f2 .globl _start, f1, f2 Index: test/ELF/eh-frame-hdr.s =================================================================== --- test/ELF/eh-frame-hdr.s +++ test/ELF/eh-frame-hdr.s @@ -32,13 +32,13 @@ //HDRDISASM: Disassembly of section foo: //HDRDISASM-NEXT: foo: -//HDRDISASM-NEXT: 11000: 90 nop +//HDRDISASM-NEXT: 401000: 90 nop //HDRDISASM-NEXT: Disassembly of section bar: //HDRDISASM-NEXT: bar: -//HDRDISASM-NEXT: 11001: 90 nop +//HDRDISASM-NEXT: 401001: 90 nop //HDRDISASM-NEXT: Disassembly of section dah: //HDRDISASM-NEXT: dah: -//HDRDISASM-NEXT: 11002: 90 nop +//HDRDISASM-NEXT: 401002: 90 nop // HDR: Sections [ // HDR: Section { @@ -48,7 +48,7 @@ // HDR-NEXT: Flags [ // HDR-NEXT: SHF_ALLOC // HDR-NEXT: ] -// HDR-NEXT: Address: 0x10158 +// HDR-NEXT: Address: 0x400158 // HDR-NEXT: Offset: 0x158 // HDR-NEXT: Size: 96 // HDR-NEXT: Link: 0 @@ -64,16 +64,16 @@ // HDR-NEXT: 0050: 5A0E0000 01000000 00000000 00000000 | // CIE: 14000000 00000000 017A5200 01781001 1B0C0708 90010000 // FDE(1): 14000000 1C000000 880E0000 01000000 00000000 00000000 -// address of data (starts with 0x880E0000) = 0x10158 + 0x0020 = 0x10178 -// The starting address to which this FDE applies = 0xE88 + 0x10178 = 0x11000 +// address of data (starts with 0x880E0000) = 0x400158 + 0x0020 = 0x400178 +// The starting address to which this FDE applies = 0xE88 + 0x400178 = 0x401000 // The number of bytes after the start address to which this FDE applies = 0x01000000 = 1 // FDE(2): 14000000 34000000 710E0000 01000000 00000000 00000000 -// address of data (starts with 0x710E0000) = 0x10158 + 0x0038 = 0x10190 -// The starting address to which this FDE applies = 0xE71 + 0x10190 = 0x11001 +// address of data (starts with 0x710E0000) = 0x400158 + 0x0038 = 0x400190 +// The starting address to which this FDE applies = 0xE71 + 0x400190 = 0x401001 // The number of bytes after the start address to which this FDE applies = 0x01000000 = 1 // FDE(3): 14000000 4C000000 5A0E0000 01000000 00000000 00000000 -// address of data (starts with 0x5A0E0000) = 0x10158 + 0x0050 = 0x101A8 -// The starting address to which this FDE applies = 0xE5A + 0x101A8 = 0x11002 +// address of data (starts with 0x5A0E0000) = 0x400158 + 0x0050 = 0x4001A8 +// The starting address to which this FDE applies = 0xE5A + 0x4001A8 = 0x401002 // The number of bytes after the start address to which this FDE applies = 0x01000000 = 1 // HDR-NEXT: ) // HDR-NEXT: } @@ -84,7 +84,7 @@ // HDR-NEXT: Flags [ // HDR-NEXT: SHF_ALLOC // HDR-NEXT: ] -// HDR-NEXT: Address: 0x101B8 +// HDR-NEXT: Address: 0x4001B8 // HDR-NEXT: Offset: 0x1B8 // HDR-NEXT: Size: 36 // HDR-NEXT: Link: 0 @@ -96,28 +96,28 @@ // HDR-NEXT: 0010: B8FFFFFF 490E0000 D0FFFFFF 4A0E0000 | // HDR-NEXT: 0020: E8FFFFFF | // Header (always 4 bytes): 0x011B033B -// 9CFFFFFF = .eh_frame(0x10158) - .eh_frame_hdr(0x101B8) - 4 +// 9CFFFFFF = .eh_frame(0x400158) - .eh_frame_hdr(0x4001B8) - 4 // 03000000 = 3 = the number of FDE pointers in the table. // Entry(1): 480E0000 B8FFFFFF -// 480E0000 = 0x11000 - .eh_frame_hdr(0x101B8) = 0xE48 -// B8FFFFFF = address of FDE(1) - .eh_frame_hdr(0x101B8) = -// = .eh_frame(0x10158) + 24 - 0x101B8 = 0xFFFFFFB8 +// 480E0000 = 0x401000 - .eh_frame_hdr(0x4001B8) = 0xE48 +// B8FFFFFF = address of FDE(1) - .eh_frame_hdr(0x4001B8) = +// = .eh_frame(0x400158) + 24 - 0x4001B8 = 0xFFFFFFB8 // Entry(2): 490E0000 D0FFFFFF -// 490E0000 = 0x11001 - .eh_frame_hdr(0x101B8) = 0xE49 -// D0FFFFFF = address of FDE(2) - .eh_frame_hdr(0x101B8) = -// = .eh_frame(0x10158) + 24 + 24 - 0x101B8 = 0xFFFFFFD0 +// 490E0000 = 0x401001 - .eh_frame_hdr(0x4001B8) = 0xE49 +// D0FFFFFF = address of FDE(2) - .eh_frame_hdr(0x4001B8) = +// = .eh_frame(0x400158) + 24 + 24 - 0x4001B8 = 0xFFFFFFD0 // Entry(3): 4A0E0000 E8FFFFFF -// 4A0E0000 = 0x11002 - .eh_frame_hdr(0x101B8) = 0xE4A -// E8FFFFFF = address of FDE(2) - .eh_frame_hdr(0x101B8) = -// = .eh_frame(0x10158) + 24 + 24 - 0x101B8 = 0xFFFFFFE8 +// 4A0E0000 = 0x401002 - .eh_frame_hdr(0x4001B8) = 0xE4A +// E8FFFFFF = address of FDE(2) - .eh_frame_hdr(0x4001B8) = +// = .eh_frame(0x400158) + 24 + 24 - 0x4001B8 = 0xFFFFFFE8 // HDR-NEXT: ) // HDR-NEXT: } // HDR: ProgramHeaders [ // HDR: ProgramHeader { // HDR: Type: PT_GNU_EH_FRAME // HDR-NEXT: Offset: 0x1B8 -// HDR-NEXT: VirtualAddress: 0x101B8 -// HDR-NEXT: PhysicalAddress: 0x101B8 +// HDR-NEXT: VirtualAddress: 0x4001B8 +// HDR-NEXT: PhysicalAddress: 0x4001B8 // HDR-NEXT: FileSize: 36 // HDR-NEXT: MemSize: 36 // HDR-NEXT: Flags [ Index: test/ELF/ehframe-relocation.s =================================================================== --- test/ELF/ehframe-relocation.s +++ test/ELF/ehframe-relocation.s @@ -10,17 +10,17 @@ // CHECK-NEXT: Flags [ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x10120 +// CHECK-NEXT: Address: 0x400120 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 48 // CHECK-NOT: .eh_frame -// 0x10120 = 65824 -// 0x10120 + 5 = 65829 +// 0x400120 = 65824 +// 0x400120 + 5 = 65829 // DISASM: Disassembly of section .text: // DISASM-NEXT: _start: -// DISASM-NEXT: 11000: {{.*}} movq 65824, %rax -// DISASM-NEXT: 11008: {{.*}} movq 65829, %rax +// DISASM-NEXT: 401000: {{.*}} movq 65824, %rax +// DISASM-NEXT: 401008: {{.*}} movq 65829, %rax .section .eh_frame,"ax",@unwind Index: test/ELF/end-update.s =================================================================== --- test/ELF/end-update.s +++ test/ELF/end-update.s @@ -12,13 +12,13 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x12000 +// CHECK-NEXT: Address: 0x402000 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 6 // CHECK: ] // CHECK: Symbols [ // CHECK: Name: end -// CHECK-NEXT: Value: 0x12006 +// CHECK-NEXT: Value: 0x402006 // CHECK: ] .global _start,end Index: test/ELF/end.s =================================================================== --- test/ELF/end.s +++ test/ELF/end.s @@ -14,13 +14,13 @@ // DEFAULT-NEXT: SHF_ALLOC // DEFAULT-NEXT: SHF_WRITE // DEFAULT-NEXT: ] -// DEFAULT-NEXT: Address: 0x12002 +// DEFAULT-NEXT: Address: 0x402002 // DEFAULT-NEXT: Offset: // DEFAULT-NEXT: Size: 6 // DEFAULT: ] // DEFAULT: Symbols [ // DEFAULT: Name: _end -// DEFAULT-NEXT: Value: 0x12008 +// DEFAULT-NEXT: Value: 0x402008 // DEFAULT: ] // RUN: ld.lld -r %t.o -o %t2 Index: test/ELF/entry.s =================================================================== --- test/ELF/entry.s +++ test/ELF/entry.s @@ -23,7 +23,7 @@ # WARN2: warning: entry symbol _start not found, assuming 0 # NOENTRY: Entry: 0x0 -# SYM: Entry: 0x11000 +# SYM: Entry: 0x401000 # DSO: Entry: 0x1000 # DEC: Entry: 0x1000 # HEX: Entry: 0xCAFE Index: test/ELF/gc-sections-implicit-addend.s =================================================================== --- test/ELF/gc-sections-implicit-addend.s +++ test/ELF/gc-sections-implicit-addend.s @@ -12,9 +12,9 @@ # CHECK-NEXT: SHF_MERGE # CHECK-NEXT: SHF_STRINGS # CHECK-NEXT: ] -# CHECK-NEXT: Address: 0x100B4 +# CHECK-NEXT: Address: 0x4000B4 -# 0x100B4 == 65716 +# 0x4000B4 == 65716 # DISASM: leal 65716, %eax .section .foo,"aMS",@progbits,1 Index: test/ELF/gdb-index.s =================================================================== --- test/ELF/gdb-index.s +++ test/ELF/gdb-index.s @@ -16,17 +16,17 @@ # DISASM: Disassembly of section .text: # DISASM: main: -# DISASM-CHECK: 11000: 55 pushq %rbp -# DISASM-CHECK: 11001: 48 89 e5 movq %rsp, %rbp -# DISASM-CHECK: 11004: b8 00 00 00 00 movl $0, %eax -# DISASM-CHECK: 11009: 5d popq %rbp -# DISASM-CHECK: 1100a: c3 retq +# DISASM-CHECK: 401000: 55 pushq %rbp +# DISASM-CHECK: 401001: 48 89 e5 movq %rsp, %rbp +# DISASM-CHECK: 401004: b8 00 00 00 00 movl $0, %eax +# DISASM-CHECK: 401009: 5d popq %rbp +# DISASM-CHECK: 40100a: c3 retq # DISASM: _Z5main2v: -# DISASM-CHECK: 1100b: 55 pushq %rbp -# DISASM-CHECK: 1100c: 48 89 e5 movq %rsp, %rbp -# DISASM-CHECK: 1100f: b8 00 00 00 00 movl $0, %eax -# DISASM-CHECK: 11014: 5d popq %rbp -# DISASM-CHECK: 11015: c3 retq +# DISASM-CHECK: 40100b: 55 pushq %rbp +# DISASM-CHECK: 40100c: 48 89 e5 movq %rsp, %rbp +# DISASM-CHECK: 40100f: b8 00 00 00 00 movl $0, %eax +# DISASM-CHECK: 401014: 5d popq %rbp +# DISASM-CHECK: 401015: c3 retq # CHECK: .gnu_index contents: # CHECK-NEXT: Version = 7 Index: test/ELF/gnu-ifunc-gotpcrel.s =================================================================== --- test/ELF/gnu-ifunc-gotpcrel.s +++ test/ELF/gnu-ifunc-gotpcrel.s @@ -6,7 +6,7 @@ # RUN: llvm-readobj -dyn-relocations %t | FileCheck %s # CHECK: Dynamic Relocations { -# CHECK-NEXT: 0x120B0 R_X86_64_GLOB_DAT foo 0x0 +# CHECK-NEXT: 0x4020B0 R_X86_64_GLOB_DAT foo 0x0 # CHECK-NEXT: } .globl _start Index: test/ELF/gnu-ifunc-i386.s =================================================================== --- test/ELF/gnu-ifunc-i386.s +++ test/ELF/gnu-ifunc-i386.s @@ -22,8 +22,8 @@ // CHECK-NEXT: } // CHECK: Relocations [ // CHECK-NEXT: Section ({{.*}}) .rel.plt { -// CHECK-NEXT: 0x1200C R_386_IRELATIVE -// CHECK-NEXT: 0x12010 R_386_IRELATIVE +// CHECK-NEXT: 0x40200C R_386_IRELATIVE +// CHECK-NEXT: 0x402010 R_386_IRELATIVE // CHECK-NEXT: } // CHECK-NEXT: ] @@ -39,7 +39,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: __rel_iplt_end -// CHECK-NEXT: Value: 0x100E4 +// CHECK-NEXT: Value: 0x4000E4 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -61,7 +61,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _start -// CHECK-NEXT: Value: 0x11002 +// CHECK-NEXT: Value: 0x401002 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None @@ -70,7 +70,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: bar -// CHECK-NEXT: Value: 0x11001 +// CHECK-NEXT: Value: 0x401001 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: GNU_IFunc @@ -79,7 +79,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: foo -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: GNU_IFunc @@ -90,28 +90,28 @@ // DISASM: Disassembly of section .text: // DISASM-NEXT: foo: -// DISASM-NEXT: 11000: c3 retl +// DISASM-NEXT: 401000: c3 retl // DISASM: bar: -// DISASM-NEXT: 11001: c3 retl +// DISASM-NEXT: 401001: c3 retl // DISASM: _start: -// DISASM-NEXT: 11002: e8 29 00 00 00 calll 41 -// DISASM-NEXT: 11007: e8 34 00 00 00 calll 52 -// DISASM-NEXT: 1100c: ba d4 00 01 00 movl $65748, %edx -// DISASM-NEXT: 11011: ba e4 00 01 00 movl $65764, %edx +// DISASM-NEXT: 401002: e8 29 00 00 00 calll 41 +// DISASM-NEXT: 401007: e8 34 00 00 00 calll 52 +// DISASM-NEXT: 40100c: ba d4 00 01 00 movl $65748, %edx +// DISASM-NEXT: 401011: ba e4 00 01 00 movl $65764, %edx // DISASM-NEXT: Disassembly of section .plt: // DISASM-NEXT: .plt: -// DISASM-NEXT: 11020: ff 35 04 20 01 00 pushl 73732 -// DISASM-NEXT: 11026: ff 25 08 20 01 00 jmpl *73736 -// DISASM-NEXT: 1102c: 90 nop -// DISASM-NEXT: 1102d: 90 nop -// DISASM-NEXT: 1102e: 90 nop -// DISASM-NEXT: 1102f: 90 nop -// DISASM-NEXT: 11030: ff 25 0c 20 01 00 jmpl *73740 -// DISASM-NEXT: 11036: 68 00 00 00 00 pushl $0 -// DISASM-NEXT: 1103b: e9 e0 ff ff ff jmp -32 <.plt> -// DISASM-NEXT: 11040: ff 25 10 20 01 00 jmpl *73744 -// DISASM-NEXT: 11046: 68 08 00 00 00 pushl $8 -// DISASM-NEXT: 1104b: e9 d0 ff ff ff jmp -48 <.plt> +// DISASM-NEXT: 401020: ff 35 04 20 01 00 pushl 73732 +// DISASM-NEXT: 401026: ff 25 08 20 01 00 jmpl *73736 +// DISASM-NEXT: 40102c: 90 nop +// DISASM-NEXT: 40102d: 90 nop +// DISASM-NEXT: 40102e: 90 nop +// DISASM-NEXT: 40102f: 90 nop +// DISASM-NEXT: 401030: ff 25 0c 20 01 00 jmpl *73740 +// DISASM-NEXT: 401036: 68 00 00 00 00 pushl $0 +// DISASM-NEXT: 40103b: e9 e0 ff ff ff jmp -32 <.plt> +// DISASM-NEXT: 401040: ff 25 10 20 01 00 jmpl *73744 +// DISASM-NEXT: 401046: 68 08 00 00 00 pushl $8 +// DISASM-NEXT: 40104b: e9 d0 ff ff ff jmp -48 <.plt> .text .type foo STT_GNU_IFUNC Index: test/ELF/gnu-ifunc.s =================================================================== --- test/ELF/gnu-ifunc.s +++ test/ELF/gnu-ifunc.s @@ -22,8 +22,8 @@ // CHECK-NEXT: } // CHECK: Relocations [ // CHECK-NEXT: Section ({{.*}}) .rela.plt { -// CHECK-NEXT: 0x12018 R_X86_64_IRELATIVE -// CHECK-NEXT: 0x12020 R_X86_64_IRELATIVE +// CHECK-NEXT: 0x402018 R_X86_64_IRELATIVE +// CHECK-NEXT: 0x402020 R_X86_64_IRELATIVE // CHECK-NEXT: } // CHECK-NEXT: ] // CHECK: Symbols [ @@ -38,7 +38,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: __rela_iplt_end -// CHECK-NEXT: Value: 0x10188 +// CHECK-NEXT: Value: 0x400188 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -60,7 +60,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _start -// CHECK-NEXT: Value: 0x11002 +// CHECK-NEXT: Value: 0x401002 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None @@ -69,7 +69,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: bar -// CHECK-NEXT: Value: 0x11001 +// CHECK-NEXT: Value: 0x401001 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: GNU_IFunc @@ -78,7 +78,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: foo -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: GNU_IFunc @@ -89,26 +89,26 @@ // DISASM: Disassembly of section .text: // DISASM-NEXT: foo: -// DISASM-NEXT: 11000: c3 retq +// DISASM-NEXT: 401000: c3 retq // DISASM: bar: -// DISASM-NEXT: 11001: c3 retq +// DISASM-NEXT: 401001: c3 retq // DISASM: _start: -// DISASM-NEXT: 11002: e8 29 00 00 00 callq 41 -// DISASM-NEXT: 11007: e8 34 00 00 00 callq 52 -// DISASM-NEXT: 1100c: ba 58 01 01 00 movl $65880, %edx -// DISASM-NEXT: 11011: ba 88 01 01 00 movl $65928, %edx -// DISASM-NEXT: 11016: ba 89 01 01 00 movl $65929, %edx +// DISASM-NEXT: 401002: e8 29 00 00 00 callq 41 +// DISASM-NEXT: 401007: e8 34 00 00 00 callq 52 +// DISASM-NEXT: 40100c: ba 58 01 01 00 movl $65880, %edx +// DISASM-NEXT: 401011: ba 88 01 01 00 movl $65928, %edx +// DISASM-NEXT: 401016: ba 89 01 01 00 movl $65929, %edx // DISASM-NEXT: Disassembly of section .plt: // DISASM-NEXT: .plt: -// DISASM-NEXT: 11020: ff 35 e2 0f 00 00 pushq 4066(%rip) -// DISASM-NEXT: 11026: ff 25 e4 0f 00 00 jmpq *4068(%rip) -// DISASM-NEXT: 1102c: 0f 1f 40 00 nopl (%rax) -// DISASM-NEXT: 11030: ff 25 e2 0f 00 00 jmpq *4066(%rip) -// DISASM-NEXT: 11036: 68 00 00 00 00 pushq $0 -// DISASM-NEXT: 1103b: e9 e0 ff ff ff jmp -32 -// DISASM-NEXT: 11040: ff 25 da 0f 00 00 jmpq *4058(%rip) -// DISASM-NEXT: 11046: 68 01 00 00 00 pushq $1 -// DISASM-NEXT: 1104b: e9 d0 ff ff ff jmp -48 +// DISASM-NEXT: 401020: ff 35 e2 0f 00 00 pushq 4066(%rip) +// DISASM-NEXT: 401026: ff 25 e4 0f 00 00 jmpq *4068(%rip) +// DISASM-NEXT: 40102c: 0f 1f 40 00 nopl (%rax) +// DISASM-NEXT: 401030: ff 25 e2 0f 00 00 jmpq *4066(%rip) +// DISASM-NEXT: 401036: 68 00 00 00 00 pushq $0 +// DISASM-NEXT: 40103b: e9 e0 ff ff ff jmp -32 +// DISASM-NEXT: 401040: ff 25 da 0f 00 00 jmpq *4058(%rip) +// DISASM-NEXT: 401046: 68 01 00 00 00 pushq $1 +// DISASM-NEXT: 40104b: e9 d0 ff ff ff jmp -48 .text .type foo STT_GNU_IFUNC Index: test/ELF/got-aarch64.s =================================================================== --- test/ELF/got-aarch64.s +++ test/ELF/got-aarch64.s @@ -23,12 +23,12 @@ // CHECK-NEXT: } // CHECK-NEXT: ] -// Page(0x20098) - Page(0x10000) = 0x10000 = 65536 +// Page(0x20098) - Page(0x400000) = 0x400000 = 65536 // 0x20098 & 0xff8 = 0x98 = 152 // DISASM: main: -// DISASM-NEXT: 10000: 80 00 00 90 adrp x0, #65536 -// DISASM-NEXT: 10004: 00 48 40 f9 ldr x0, [x0, #144] +// DISASM-NEXT: 400000: 80 00 00 90 adrp x0, #65536 +// DISASM-NEXT: 400004: 00 48 40 f9 ldr x0, [x0, #144] .global main,foo,dat .text Index: test/ELF/got-i386.s =================================================================== --- test/ELF/got-i386.s +++ test/ELF/got-i386.s @@ -10,7 +10,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x12000 +// CHECK-NEXT: Address: 0x402000 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 0 // CHECK-NEXT: Link: @@ -19,7 +19,7 @@ // CHECK: Symbol { // CHECK: Name: bar -// CHECK-NEXT: Value: 0x12000 +// CHECK-NEXT: Value: 0x402000 // CHECK-NEXT: Size: 10 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object @@ -28,7 +28,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: obj -// CHECK-NEXT: Value: 0x1200A +// CHECK-NEXT: Value: 0x40200A // CHECK-NEXT: Size: 10 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object @@ -36,14 +36,14 @@ // CHECK-NEXT: Section: .bss // CHECK-NEXT: } -// 0x12000 - 0 = addr(.got) = 0x12000 -// 0x1200A - 10 = addr(.got) = 0x12000 -// 0x1200A + 5 - 15 = addr(.got) = 0x12000 +// 0x402000 - 0 = addr(.got) = 0x402000 +// 0x40200A - 10 = addr(.got) = 0x402000 +// 0x40200A + 5 - 15 = addr(.got) = 0x402000 // DISASM: Disassembly of section .text: // DISASM-NEXT: _start: -// DISASM-NEXT: 11000: c7 81 00 00 00 00 01 00 00 00 movl $1, (%ecx) -// DISASM-NEXT: 1100a: c7 81 0a 00 00 00 02 00 00 00 movl $2, 10(%ecx) -// DISASM-NEXT: 11014: c7 81 0f 00 00 00 03 00 00 00 movl $3, 15(%ecx) +// DISASM-NEXT: 401000: c7 81 00 00 00 00 01 00 00 00 movl $1, (%ecx) +// DISASM-NEXT: 40100a: c7 81 0a 00 00 00 02 00 00 00 movl $2, 10(%ecx) +// DISASM-NEXT: 401014: c7 81 0f 00 00 00 03 00 00 00 movl $3, 15(%ecx) .global _start _start: Index: test/ELF/got.s =================================================================== --- test/ELF/got.s +++ test/ELF/got.s @@ -12,7 +12,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x120B0 +// CHECK-NEXT: Address: 0x4020B0 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 16 // CHECK-NEXT: Link: 0 @@ -21,22 +21,22 @@ // CHECK: Relocations [ // CHECK-NEXT: Section ({{.*}}) .rela.dyn { -// CHECK-NEXT: 0x120B0 R_X86_64_GLOB_DAT bar 0x0 -// CHECK-NEXT: 0x120B8 R_X86_64_GLOB_DAT zed 0x0 +// CHECK-NEXT: 0x4020B0 R_X86_64_GLOB_DAT bar 0x0 +// CHECK-NEXT: 0x4020B8 R_X86_64_GLOB_DAT zed 0x0 // CHECK-NEXT: } // CHECK-NEXT: ] // Unfortunately FileCheck can't do math, so we have to check for explicit // values: -// 0x120B0 - (0x11000 + 2) - 4 = 4266 -// 0x120B0 - (0x11006 + 2) - 4 = 4260 -// 0x120A8 - (0x1100c + 2) - 4 = 4262 +// 0x4020B0 - (0x401000 + 2) - 4 = 4266 +// 0x4020B0 - (0x401006 + 2) - 4 = 4260 +// 0x4020A8 - (0x40100c + 2) - 4 = 4262 // DISASM: _start: -// DISASM-NEXT: 11000: {{.*}} jmpq *4266(%rip) -// DISASM-NEXT: 11006: {{.*}} jmpq *4260(%rip) -// DISASM-NEXT: 1100c: {{.*}} jmpq *4262(%rip) +// DISASM-NEXT: 401000: {{.*}} jmpq *4266(%rip) +// DISASM-NEXT: 401006: {{.*}} jmpq *4260(%rip) +// DISASM-NEXT: 40100c: {{.*}} jmpq *4262(%rip) .global _start _start: Index: test/ELF/gotpc-relax-nopic.s =================================================================== --- test/ELF/gotpc-relax-nopic.s +++ test/ELF/gotpc-relax-nopic.s @@ -10,20 +10,20 @@ # SYMRELOC: Symbols [ # SYMRELOC: Symbol { # SYMRELOC: Name: bar -# SYMRELOC-NEXT: Value: 0x12000 +# SYMRELOC-NEXT: Value: 0x402000 -## 73728 = 0x12000 (bar) +## 73728 = 0x402000 (bar) # DISASM: Disassembly of section .text: # DISASM-NEXT: _start: -# DISASM-NEXT: 11000: 48 81 d0 00 20 01 00 adcq $73728, %rax -# DISASM-NEXT: 11007: 48 81 c3 00 20 01 00 addq $73728, %rbx -# DISASM-NEXT: 1100e: 48 81 e1 00 20 01 00 andq $73728, %rcx -# DISASM-NEXT: 11015: 48 81 fa 00 20 01 00 cmpq $73728, %rdx -# DISASM-NEXT: 1101c: 48 81 cf 00 20 01 00 orq $73728, %rdi -# DISASM-NEXT: 11023: 48 81 de 00 20 01 00 sbbq $73728, %rsi -# DISASM-NEXT: 1102a: 48 81 ed 00 20 01 00 subq $73728, %rbp -# DISASM-NEXT: 11031: 49 81 f0 00 20 01 00 xorq $73728, %r8 -# DISASM-NEXT: 11038: 49 f7 c7 00 20 01 00 testq $73728, %r15 +# DISASM-NEXT: 401000: 48 81 d0 00 20 01 00 adcq $73728, %rax +# DISASM-NEXT: 401007: 48 81 c3 00 20 01 00 addq $73728, %rbx +# DISASM-NEXT: 40100e: 48 81 e1 00 20 01 00 andq $73728, %rcx +# DISASM-NEXT: 401015: 48 81 fa 00 20 01 00 cmpq $73728, %rdx +# DISASM-NEXT: 40101c: 48 81 cf 00 20 01 00 orq $73728, %rdi +# DISASM-NEXT: 401023: 48 81 de 00 20 01 00 sbbq $73728, %rsi +# DISASM-NEXT: 40102a: 48 81 ed 00 20 01 00 subq $73728, %rbp +# DISASM-NEXT: 401031: 49 81 f0 00 20 01 00 xorq $73728, %r8 +# DISASM-NEXT: 401038: 49 f7 c7 00 20 01 00 testq $73728, %r15 # RUN: ld.lld -shared %t.o -o %t2 # RUN: llvm-readobj -s -r -d %t2 | FileCheck --check-prefix=SEC-PIC %s Index: test/ELF/gotpc-relax.s =================================================================== --- test/ELF/gotpc-relax.s +++ test/ELF/gotpc-relax.s @@ -8,17 +8,17 @@ # RELOC: Relocations [ # RELOC: ] -# 0x11003 + 7 - 10 = 0x11000 -# 0x1100a + 7 - 17 = 0x11000 -# 0x11011 + 7 - 23 = 0x11001 -# 0x11018 + 7 - 30 = 0x11001 +# 0x401003 + 7 - 10 = 0x401000 +# 0x40100a + 7 - 17 = 0x401000 +# 0x401011 + 7 - 23 = 0x401001 +# 0x401018 + 7 - 30 = 0x401001 # DISASM: Disassembly of section .text: # DISASM-NEXT: foo: -# DISASM-NEXT: 11000: 90 nop +# DISASM-NEXT: 401000: 90 nop # DISASM: hid: -# DISASM-NEXT: 11001: 90 nop +# DISASM-NEXT: 401001: 90 nop # DISASM: ifunc: -# DISASM-NEXT: 11002: c3 retq +# DISASM-NEXT: 401002: c3 retq # DISASM: _start: # DISASM-NEXT: leaq -10(%rip), %rax # DISASM-NEXT: leaq -17(%rip), %rax Index: test/ELF/init-fini.s =================================================================== --- test/ELF/init-fini.s +++ test/ELF/init-fini.s @@ -4,14 +4,14 @@ // Should use "_init" and "_fini" by default when fills dynamic table // RUN: ld.lld -shared %t -o %t2 // RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=BYDEF %s -// BYDEF: INIT 0x11010 -// BYDEF: FINI 0x11020 +// BYDEF: INIT 0x401010 +// BYDEF: FINI 0x401020 // -init and -fini override symbols to use // RUN: ld.lld -shared %t -o %t2 -init _foo -fini _bar // RUN: llvm-readobj -dynamic-table %t2 | FileCheck --check-prefix=OVR %s -// OVR: INIT 0x11030 -// OVR: FINI 0x11040 +// OVR: INIT 0x401030 +// OVR: FINI 0x401040 // Check aliases as well // RUN: ld.lld -shared %t -o %t2 -init=_foo -fini=_bar @@ -37,7 +37,7 @@ .global _start,_init,_fini,_foo,_bar,_undef _start: -_init = 0x11010 -_fini = 0x11020 -_foo = 0x11030 -_bar = 0x11040 +_init = 0x401010 +_fini = 0x401020 +_foo = 0x401030 +_bar = 0x401040 Index: test/ELF/linkerscript/align.s =================================================================== --- test/ELF/linkerscript/align.s +++ test/ELF/linkerscript/align.s @@ -3,7 +3,7 @@ ## Check that ALIGN command workable using location counter # RUN: echo "SECTIONS { \ -# RUN: . = 0x10000; \ +# RUN: . = 0x400000; \ # RUN: .aaa : \ # RUN: { \ # RUN: *(.aaa) \ @@ -30,7 +30,7 @@ ## Check output sections ALIGN modificator # RUN: echo "SECTIONS { \ -# RUN: . = 0x10000; \ +# RUN: . = 0x400000; \ # RUN: .aaa : \ # RUN: { \ # RUN: *(.aaa) \ Index: test/ELF/linkerscript/define.s =================================================================== --- test/ELF/linkerscript/define.s +++ test/ELF/linkerscript/define.s @@ -3,9 +3,9 @@ # RUN: echo "SECTIONS \ # RUN: { \ -# RUN: . = DEFINED(defined) ? 0x11000 : .; \ +# RUN: . = DEFINED(defined) ? 0x401000 : .; \ # RUN: .foo : { *(.foo*) } \ -# RUN: . = DEFINED(notdefined) ? 0x12000 : 0x13000; \ +# RUN: . = DEFINED(notdefined) ? 0x402000 : 0x403000; \ # RUN: .bar : { *(.bar*) } \ # RUN: }" > %t.script # RUN: ld.lld -o %t1 --script %t.script %t Index: test/ELF/linkerscript/locationcounter.s =================================================================== --- test/ELF/linkerscript/locationcounter.s +++ test/ELF/linkerscript/locationcounter.s @@ -4,23 +4,23 @@ # RUN: . = 0xFFF0; \ # RUN: . = . + 0x10; \ # RUN: .plus : { *(.plus) } \ -# RUN: . = 0x11010 - 0x10; \ +# RUN: . = 0x401010 - 0x10; \ # RUN: .minus : { *(.minus) } \ # RUN: . = 0x24000 / 0x2; \ # RUN: .div : { *(.div) } \ -# RUN: . = 0x11000 + 0x1000 * 0x2; \ +# RUN: . = 0x401000 + 0x1000 * 0x2; \ # RUN: .mul : { *(.mul) } \ -# RUN: . = 0x10000 + (0x1000 + 0x1000) * 0x2; \ +# RUN: . = 0x400000 + (0x1000 + 0x1000) * 0x2; \ # RUN: .bracket : { *(.bracket) } \ -# RUN: . = 0x17000 & 0x15000; \ +# RUN: . = 0x407000 & 0x405000; \ # RUN: .and : { *(.and) } \ -# RUN: . = 0x1 ? 0x16000 : 0x999999; \ +# RUN: . = 0x1 ? 0x406000 : 0x999999; \ # RUN: .ternary1 : { *(.ternary1) } \ -# RUN: . = 0x0 ? 0x999999 : 0x17000; \ +# RUN: . = 0x0 ? 0x999999 : 0x407000; \ # RUN: .ternary2 : { *(.ternary2) } \ -# RUN: . = 0x0 < 0x1 ? 0x18000 : 0x999999; \ +# RUN: . = 0x0 < 0x1 ? 0x408000 : 0x999999; \ # RUN: .less : { *(.less) } \ -# RUN: . = 0x1 <= 0x1 ? 0x19000 : 0x999999; \ +# RUN: . = 0x1 <= 0x1 ? 0x409000 : 0x999999; \ # RUN: .lesseq : { *(.lesseq) } \ # RUN: . = 0x1 > 0x0 ? 0x20000 : 0x999999; \ # RUN: .great : { *(.great) } \ @@ -83,7 +83,7 @@ ## Missing closing bracket. # RUN: echo "SECTIONS { \ -# RUN: . = 0x10000 + (0x1000 + 0x1000 * 0x2; \ +# RUN: . = 0x400000 + (0x1000 + 0x1000 * 0x2; \ # RUN: }" > %t.script # RUN: not ld.lld %t --script %t.script -o %t2 2>&1 | \ # RUN: FileCheck --check-prefix=BRACKETERR %s @@ -91,7 +91,7 @@ ## Missing opening bracket. # RUN: echo "SECTIONS { \ -# RUN: . = 0x10000 + 0x1000 + 0x1000) * 0x2; \ +# RUN: . = 0x400000 + 0x1000 + 0x1000) * 0x2; \ # RUN: }" > %t.script # RUN: not ld.lld %t --script %t.script -o %t2 2>&1 | \ # RUN: FileCheck --check-prefix=BRACKETERR2 %s @@ -107,7 +107,7 @@ ## Div by zero error. # RUN: echo "SECTIONS { \ -# RUN: . = 0x10000 / 0x0; \ +# RUN: . = 0x400000 / 0x0; \ # RUN: }" > %t.script # RUN: not ld.lld %t --script %t.script -o %t2 2>&1 | \ # RUN: FileCheck --check-prefix=DIVZERO %s Index: test/ELF/linkerscript/page-size.s =================================================================== --- test/ELF/linkerscript/page-size.s +++ test/ELF/linkerscript/page-size.s @@ -8,40 +8,40 @@ # CHECK: ProgramHeader { # CHECK: Type: PT_LOAD # CHECK-NEXT: Offset: 0x0 -# CHECK-NEXT: VirtualAddress: 0x10000 -# CHECK-NEXT: PhysicalAddress: 0x10000 +# CHECK-NEXT: VirtualAddress: 0x400000 +# CHECK-NEXT: PhysicalAddress: 0x400000 # CHECK-NEXT: FileSize: 344 # CHECK-NEXT: MemSize: 344 # CHECK-NEXT: Flags [ # CHECK-NEXT: PF_R # CHECK-NEXT: ] -# CHECK-NEXT: Alignment: 16384 +# CHECK-NEXT: Alignment: 406384 # CHECK-NEXT: } # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_LOAD # CHECK-NEXT: Offset: 0x4000 -# CHECK-NEXT: VirtualAddress: 0x14000 -# CHECK-NEXT: PhysicalAddress: 0x14000 +# CHECK-NEXT: VirtualAddress: 0x404000 +# CHECK-NEXT: PhysicalAddress: 0x404000 # CHECK-NEXT: FileSize: 1 # CHECK-NEXT: MemSize: 1 # CHECK-NEXT: Flags [ # CHECK-NEXT: PF_R # CHECK-NEXT: PF_X # CHECK-NEXT: ] -# CHECK-NEXT: Alignment: 16384 +# CHECK-NEXT: Alignment: 406384 # CHECK-NEXT: } # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_LOAD # CHECK-NEXT: Offset: 0x8000 -# CHECK-NEXT: VirtualAddress: 0x18000 -# CHECK-NEXT: PhysicalAddress: 0x18000 +# CHECK-NEXT: VirtualAddress: 0x408000 +# CHECK-NEXT: PhysicalAddress: 0x408000 # CHECK-NEXT: FileSize: 8 # CHECK-NEXT: MemSize: 8 # CHECK-NEXT: Flags [ # CHECK-NEXT: PF_R # CHECK-NEXT: PF_W # CHECK-NEXT: ] -# CHECK-NEXT: Alignment: 16384 +# CHECK-NEXT: Alignment: 406384 # CHECK-NEXT: } # RUN: echo "SECTIONS { \ Index: test/ELF/linkerscript/symbols-synthetic.s =================================================================== --- test/ELF/linkerscript/symbols-synthetic.s +++ test/ELF/linkerscript/symbols-synthetic.s @@ -50,7 +50,7 @@ # Check that we can do the same as above inside SECTIONS block. # RUN: echo "SECTIONS { \ -# RUN: . = 0x11000; \ +# RUN: . = 0x401000; \ # RUN: .text : { *(.text) } \ # RUN: PROVIDE_HIDDEN(_begin_sec = ADDR(.text)); \ # RUN: PROVIDE_HIDDEN(_end_sec = ADDR(.text) + SIZEOF(.text)); }" > %t.script Index: test/ELF/local-got.s =================================================================== --- test/ELF/local-got.s +++ test/ELF/local-got.s @@ -14,14 +14,14 @@ foo: nop -// 0x120B0 - 0x11000 - 5 = 4251 -// 0x120B8 - 0x11005 - 5 = 4254 +// 0x4020B0 - 0x401000 - 5 = 4251 +// 0x4020B8 - 0x401005 - 5 = 4254 // DISASM: _start: -// DISASM-NEXT: 11000: {{.*}} callq 4267 -// DISASM-NEXT: 11005: {{.*}} callq 4270 +// DISASM-NEXT: 401000: {{.*}} callq 4267 +// DISASM-NEXT: 401005: {{.*}} callq 4270 // DISASM: foo: -// DISASM-NEXT: 1100a: {{.*}} nop +// DISASM-NEXT: 40100a: {{.*}} nop // CHECK: Name: .got // CHECK-NEXT: Type: SHT_PROGBITS @@ -29,7 +29,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x120B0 +// CHECK-NEXT: Address: 0x4020B0 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 16 // CHECK-NEXT: Link: 0 @@ -37,12 +37,12 @@ // CHECK-NEXT: AddressAlignment: 8 // CHECK-NEXT: EntrySize: 0 // CHECK-NEXT: SectionData ( -// 0x1200a in little endian +// 0x40200a in little endian // CHECK-NEXT: 0000: 00000000 00000000 0A100100 00000000 // CHECK-NEXT: ) // CHECK: Relocations [ // CHECK-NEXT: Section ({{.*}}) .rela.dyn { -// CHECK-NEXT: 0x120B0 R_X86_64_GLOB_DAT bar 0x0 +// CHECK-NEXT: 0x4020B0 R_X86_64_GLOB_DAT bar 0x0 // CHECK-NEXT: } // CHECK-NEXT: ] Index: test/ELF/local.s =================================================================== --- test/ELF/local.s +++ test/ELF/local.s @@ -46,7 +46,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: blah -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -55,7 +55,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: foo -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -64,7 +64,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: goo -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -73,7 +73,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _start -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None Index: test/ELF/merge.s =================================================================== --- test/ELF/merge.s +++ test/ELF/merge.s @@ -23,7 +23,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_MERGE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x10120 +// CHECK-NEXT: Address: 0x400120 // CHECK-NEXT: Offset: 0x120 // CHECK-NEXT: Size: 8 // CHECK-NEXT: Link: 0 @@ -35,13 +35,13 @@ // CHECK-NEXT: ) -// Address of the constant 0x10 = 0x10120 = 65824 -// Address of the constant 0x42 = 0x10124 = 65828 +// Address of the constant 0x10 = 0x400120 = 65824 +// Address of the constant 0x42 = 0x400124 = 65828 // CHECK: Symbols [ // CHECK: Name: bar -// CHECK-NEXT: Value: 0x10124 +// CHECK-NEXT: Value: 0x400124 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Loca // CHECK-NEXT: Type: None @@ -49,7 +49,7 @@ // CHECK-NEXT: Section: .mysec // CHECK: Name: zed -// CHECK-NEXT: Value: 0x10124 +// CHECK-NEXT: Value: 0x400124 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -57,7 +57,7 @@ // CHECK-NEXT: Section: .mysec // CHECK: Name: foo -// CHECK-NEXT: Value: 0x10124 +// CHECK-NEXT: Value: 0x400124 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None Index: test/ELF/mips-26-mask.s =================================================================== --- test/ELF/mips-26-mask.s +++ test/ELF/mips-26-mask.s @@ -8,7 +8,7 @@ # CHECK: Disassembly of section .text: # CHECK: __start: -# CHECK-NEXT: 20000: 0e 00 80 00 jal 134348800 +# CHECK-NEXT: 400000: 0e 00 80 00 jal 134348800 .text .global __start Index: test/ELF/mips-26.s =================================================================== --- test/ELF/mips-26.s +++ test/ELF/mips-26.s @@ -13,32 +13,32 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: bar: -# CHECK-NEXT: 20000: 0c 00 80 06 jal 131096 -# CHECK-NEXT: 20004: 00 00 00 00 nop +# CHECK-NEXT: 400000: 0c 00 80 06 jal 131096 +# CHECK-NEXT: 400004: 00 00 00 00 nop # # CHECK: __start: -# CHECK-NEXT: 20008: 0c 00 80 00 jal 131072 -# CHECK-NEXT: 2000c: 00 00 00 00 nop -# CHECK-NEXT: 20010: 0c 00 80 10 jal 131136 +# CHECK-NEXT: 400008: 0c 00 80 00 jal 131072 +# CHECK-NEXT: 40000c: 00 00 00 00 nop +# CHECK-NEXT: 400010: 0c 00 80 10 jal 131136 # ^-- 0x20040 gotplt[foo0] -# CHECK-NEXT: 20014: 00 00 00 00 nop +# CHECK-NEXT: 400014: 00 00 00 00 nop # # CHECK: loc: -# CHECK-NEXT: 20018: 00 00 00 00 nop +# CHECK-NEXT: 400018: 00 00 00 00 nop # CHECK-NEXT: Disassembly of section .plt: # CHECK-NEXT: .plt: -# CHECK-NEXT: 20020: 3c 1c 00 04 lui $gp, 4 -# CHECK-NEXT: 20024: 8f 99 00 04 lw $25, 4($gp) -# CHECK-NEXT: 20028: 27 9c 00 04 addiu $gp, $gp, 4 -# CHECK-NEXT: 2002c: 03 1c c0 23 subu $24, $24, $gp -# CHECK-NEXT: 20030: 03 e0 78 25 move $15, $ra -# CHECK-NEXT: 20034: 00 18 c0 82 srl $24, $24, 2 -# CHECK-NEXT: 20038: 03 20 f8 09 jalr $25 -# CHECK-NEXT: 2003c: 27 18 ff fe addiu $24, $24, -2 -# CHECK-NEXT: 20040: 3c 0f 00 04 lui $15, 4 -# CHECK-NEXT: 20044: 8d f9 00 0c lw $25, 12($15) -# CHECK-NEXT: 20048: 03 20 00 08 jr $25 -# CHECK-NEXT: 2004c: 25 f8 00 0c addiu $24, $15, 12 +# CHECK-NEXT: 400020: 3c 1c 00 04 lui $gp, 4 +# CHECK-NEXT: 400024: 8f 99 00 04 lw $25, 4($gp) +# CHECK-NEXT: 400028: 27 9c 00 04 addiu $gp, $gp, 4 +# CHECK-NEXT: 40002c: 03 1c c0 23 subu $24, $24, $gp +# CHECK-NEXT: 400030: 03 e0 78 25 move $15, $ra +# CHECK-NEXT: 400034: 00 18 c0 82 srl $24, $24, 2 +# CHECK-NEXT: 400038: 03 20 f8 09 jalr $25 +# CHECK-NEXT: 40003c: 27 18 ff fe addiu $24, $24, -2 +# CHECK-NEXT: 400040: 3c 0f 00 04 lui $15, 4 +# CHECK-NEXT: 400044: 8d f9 00 0c lw $25, 12($15) +# CHECK-NEXT: 400048: 03 20 00 08 jr $25 +# CHECK-NEXT: 40004c: 25 f8 00 0c addiu $24, $15, 12 # REL: Name: .plt # REL-NEXT: Type: SHT_PROGBITS Index: test/ELF/mips-64-disp.s =================================================================== --- test/ELF/mips-64-disp.s +++ test/ELF/mips-64-disp.s @@ -11,11 +11,11 @@ # REQUIRES: mips # CHECK: __start: -# CHECK-NEXT: 20000: 24 42 80 40 addiu $2, $2, -32704 -# CHECK-NEXT: 20004: 24 42 80 20 addiu $2, $2, -32736 -# CHECK-NEXT: 20008: 24 42 80 28 addiu $2, $2, -32728 -# CHECK-NEXT: 2000c: 24 42 80 30 addiu $2, $2, -32720 -# CHECK-NEXT: 20010: 24 42 80 38 addiu $2, $2, -32712 +# CHECK-NEXT: 400000: 24 42 80 40 addiu $2, $2, -32704 +# CHECK-NEXT: 400004: 24 42 80 20 addiu $2, $2, -32736 +# CHECK-NEXT: 400008: 24 42 80 28 addiu $2, $2, -32728 +# CHECK-NEXT: 40000c: 24 42 80 30 addiu $2, $2, -32720 +# CHECK-NEXT: 400010: 24 42 80 38 addiu $2, $2, -32712 # CHECK: 0000000000020014 .text 00000000 foo # CHECK: 0000000000037ff0 .got 00000000 .hidden _gp Index: test/ELF/mips-64-got.s =================================================================== --- test/ELF/mips-64-got.s +++ test/ELF/mips-64-got.s @@ -12,11 +12,11 @@ # CHECK: __start: -# CHECK-NEXT: 20000: df 82 80 20 ld $2, -32736($gp) -# CHECK-NEXT: 20004: 64 42 00 18 daddiu $2, $2, 24 -# CHECK-NEXT: 20008: 24 42 80 38 addiu $2, $2, -32712 -# CHECK-NEXT: 2000c: 24 42 80 28 addiu $2, $2, -32728 -# CHECK-NEXT: 20010: 24 42 80 30 addiu $2, $2, -32720 +# CHECK-NEXT: 400000: df 82 80 20 ld $2, -32736($gp) +# CHECK-NEXT: 400004: 64 42 00 18 daddiu $2, $2, 24 +# CHECK-NEXT: 400008: 24 42 80 38 addiu $2, $2, -32712 +# CHECK-NEXT: 40000c: 24 42 80 28 addiu $2, $2, -32728 +# CHECK-NEXT: 400010: 24 42 80 30 addiu $2, $2, -32720 # CHECK: 0000000000020018 .text 00000000 foo # CHECK: 0000000000037ff0 .got 00000000 .hidden _gp Index: test/ELF/mips-64-gprel-so.s =================================================================== --- test/ELF/mips-64-gprel-so.s +++ test/ELF/mips-64-gprel-so.s @@ -8,9 +8,9 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: foo: -# CHECK-NEXT: 10000: 3c 1c 00 01 lui $gp, 1 -# CHECK-NEXT: 10004: 03 99 e0 2d daddu $gp, $gp, $25 -# CHECK-NEXT: 10008: 67 9c 7f f0 daddiu $gp, $gp, 32752 +# CHECK-NEXT: 400000: 3c 1c 00 01 lui $gp, 1 +# CHECK-NEXT: 400004: 03 99 e0 2d daddu $gp, $gp, $25 +# CHECK-NEXT: 400008: 67 9c 7f f0 daddiu $gp, $gp, 32752 # CHECK: 0000000000027ff0 .got 00000000 .hidden _gp # CHECK: 0000000000010000 .text 00000000 foo Index: test/ELF/mips-64-rels.s =================================================================== --- test/ELF/mips-64-rels.s +++ test/ELF/mips-64-rels.s @@ -9,18 +9,18 @@ # REQUIRES: mips # CHECK: __start: -# CHECK-NEXT: 20000: 3c 1c 00 01 lui $gp, 1 +# CHECK-NEXT: 400000: 3c 1c 00 01 lui $gp, 1 # ^-- 0x20000 - 0x37ff0 # ^-- 0 - 0xfffffffffffe8010 -# ^-- %hi(0x17ff0) +# ^-- %hi(0x407ff0) # CHECK: loc: -# CHECK-NEXT: 20004: 67 9c 7f f0 daddiu $gp, $gp, 32752 +# CHECK-NEXT: 400004: 67 9c 7f f0 daddiu $gp, $gp, 32752 # ^-- 0x20000 - 0x37ff0 # ^-- 0 - 0xfffffffffffe8010 -# ^-- %lo(0x17ff0) +# ^-- %lo(0x407ff0) # CHECK: Contents of section .rodata: -# CHECK-NEXT: 10190 ffffffff fffe8014 +# CHECK-NEXT: 400190 ffffffff fffe8014 # ^-- 0x20004 - 0x37ff0 = 0xfffffffffffe8014 # CHECK: 0000000000020004 .text 00000000 loc Index: test/ELF/mips-call-hilo.s =================================================================== --- test/ELF/mips-call-hilo.s +++ test/ELF/mips-call-hilo.s @@ -9,12 +9,12 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: foo: -# CHECK-NEXT: 10000: 3c 02 00 00 lui $2, 0 -# CHECK-NEXT: 10004: 8c 42 80 20 lw $2, -32736($2) -# CHECK-NEXT: 10008: 3c 02 00 00 lui $2, 0 -# CHECK-NEXT: 1000c: 8c 42 80 18 lw $2, -32744($2) -# CHECK-NEXT: 10010: 3c 02 00 00 lui $2, 0 -# CHECK-NEXT: 10014: 8c 42 80 1c lw $2, -32740($2) +# CHECK-NEXT: 400000: 3c 02 00 00 lui $2, 0 +# CHECK-NEXT: 400004: 8c 42 80 20 lw $2, -32736($2) +# CHECK-NEXT: 400008: 3c 02 00 00 lui $2, 0 +# CHECK-NEXT: 40000c: 8c 42 80 18 lw $2, -32744($2) +# CHECK-NEXT: 400010: 3c 02 00 00 lui $2, 0 +# CHECK-NEXT: 400014: 8c 42 80 1c lw $2, -32740($2) # GOT: Relocations [ # GOT-NEXT: ] @@ -25,12 +25,12 @@ # GOT-NEXT: Entry { # GOT-NEXT: Address: 0x20008 # GOT-NEXT: Access: -32744 -# GOT-NEXT: Initial: 0x10018 +# GOT-NEXT: Initial: 0x400018 # GOT-NEXT: } # GOT-NEXT: Entry { # GOT-NEXT: Address: 0x2000C # GOT-NEXT: Access: -32740 -# GOT-NEXT: Initial: 0x1001C +# GOT-NEXT: Initial: 0x40001C # GOT-NEXT: } # GOT-NEXT: ] # GOT-NEXT: Global entries [ Index: test/ELF/mips-call16.s =================================================================== --- test/ELF/mips-call16.s +++ test/ELF/mips-call16.s @@ -20,7 +20,7 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: __start: -# CHECK-NEXT: 10000: 8f 88 80 18 lw $8, -32744 +# CHECK-NEXT: 400000: 8f 88 80 18 lw $8, -32744 # GOT: Name: g1 # GOT-NEXT: Value: 0x[[ADDR:[0-9A-F]+]] Index: test/ELF/mips-dynamic.s =================================================================== --- test/ELF/mips-dynamic.s +++ test/ELF/mips-dynamic.s @@ -49,7 +49,7 @@ # EXE-DAG: 0x00000003 PLTGOT [[GOTADDR]] # EXE-DAG: 0x70000001 MIPS_RLD_VERSION 1 # EXE-DAG: 0x70000005 MIPS_FLAGS NOTPOT -# EXE-DAG: 0x70000006 MIPS_BASE_ADDRESS 0x10000 +# EXE-DAG: 0x70000006 MIPS_BASE_ADDRESS 0x400000 # EXE-DAG: 0x7000000A MIPS_LOCAL_GOTNO 2 # EXE-DAG: 0x70000011 MIPS_SYMTABNO 2 # EXE-DAG: 0x70000013 MIPS_GOTSYM 0x2 Index: test/ELF/mips-got-hilo.s =================================================================== --- test/ELF/mips-got-hilo.s +++ test/ELF/mips-got-hilo.s @@ -9,12 +9,12 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: foo: -# CHECK-NEXT: 10000: 3c 02 00 00 lui $2, 0 -# CHECK-NEXT: 10004: 8c 42 80 20 lw $2, -32736($2) -# CHECK-NEXT: 10008: 3c 02 00 00 lui $2, 0 -# CHECK-NEXT: 1000c: 8c 42 80 18 lw $2, -32744($2) -# CHECK-NEXT: 10010: 3c 02 00 00 lui $2, 0 -# CHECK-NEXT: 10014: 8c 42 80 1c lw $2, -32740($2) +# CHECK-NEXT: 400000: 3c 02 00 00 lui $2, 0 +# CHECK-NEXT: 400004: 8c 42 80 20 lw $2, -32736($2) +# CHECK-NEXT: 400008: 3c 02 00 00 lui $2, 0 +# CHECK-NEXT: 40000c: 8c 42 80 18 lw $2, -32744($2) +# CHECK-NEXT: 400010: 3c 02 00 00 lui $2, 0 +# CHECK-NEXT: 400014: 8c 42 80 1c lw $2, -32740($2) # GOT: Relocations [ # GOT-NEXT: ] Index: test/ELF/mips-got-redundant.s =================================================================== --- test/ELF/mips-got-redundant.s +++ test/ELF/mips-got-redundant.s @@ -43,7 +43,7 @@ .section .data.1,"aw",%progbits loc1: - .space 0x10000 + .space 0x400000 loc2: .word 0 loc3: Index: test/ELF/mips-got-relocs.s =================================================================== --- test/ELF/mips-got-relocs.s +++ test/ELF/mips-got-relocs.s @@ -65,8 +65,8 @@ # +-- Lazy resolver (0x0) # v1GotAddr (0x3000c) - _gp (0x37ff4) = -0x7fe8 => 0x8018 = 32792 -# EXE_DIS_BE: 20000: 3c 02 80 18 lui $2, 32792 -# EXE_DIS_EL: 20000: 18 80 02 3c lui $2, 32792 +# EXE_DIS_BE: 400000: 3c 02 80 18 lui $2, 32792 +# EXE_DIS_EL: 400000: 18 80 02 3c lui $2, 32792 # DSO_SYM: Sections: # DSO_SYM: .got 0000000c 0000000000020000 DATA @@ -88,8 +88,8 @@ # +-- Lazy resolver (0x0) # v1GotAddr (0x2000c) - _gp (0x27ff4) = -0x7fe8 => 0x8018 = 32792 -# DSO_DIS_BE: 10000: 3c 02 80 18 lui $2, 32792 -# DSO_DIS_EL: 10000: 18 80 02 3c lui $2, 32792 +# DSO_DIS_BE: 400000: 3c 02 80 18 lui $2, 32792 +# DSO_DIS_EL: 400000: 18 80 02 3c lui $2, 32792 # NORELOC: Relocations [ # NORELOC-NEXT: ] Index: test/ELF/mips-got16.s =================================================================== --- test/ELF/mips-got16.s +++ test/ELF/mips-got16.s @@ -9,17 +9,17 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: __start: -# CHECK-NEXT: 10000: 8f 88 80 18 lw $8, -32744($gp) -# CHECK-NEXT: 10004: 21 08 00 2c addi $8, $8, 44 -# CHECK-NEXT: 10008: 8f 88 80 1c lw $8, -32740($gp) -# CHECK-NEXT: 1000c: 21 08 90 00 addi $8, $8, -28672 -# CHECK-NEXT: 10010: 8f 88 80 20 lw $8, -32736($gp) -# CHECK-NEXT: 10014: 21 08 90 04 addi $8, $8, -28668 -# CHECK-NEXT: 10018: 8f 88 80 20 lw $8, -32736($gp) -# CHECK-NEXT: 1001c: 21 08 10 04 addi $8, $8, 4100 -# CHECK-NEXT: 10020: 8f 88 80 28 lw $8, -32728($gp) -# CHECK-NEXT: 10024: 21 08 10 08 addi $8, $8, 4104 -# CHECK-NEXT: 10028: 8f 88 80 2c lw $8, -32724($gp) +# CHECK-NEXT: 400000: 8f 88 80 18 lw $8, -32744($gp) +# CHECK-NEXT: 400004: 21 08 00 2c addi $8, $8, 44 +# CHECK-NEXT: 400008: 8f 88 80 1c lw $8, -32740($gp) +# CHECK-NEXT: 40000c: 21 08 90 00 addi $8, $8, -28672 +# CHECK-NEXT: 400010: 8f 88 80 20 lw $8, -32736($gp) +# CHECK-NEXT: 400014: 21 08 90 04 addi $8, $8, -28668 +# CHECK-NEXT: 400018: 8f 88 80 20 lw $8, -32736($gp) +# CHECK-NEXT: 40001c: 21 08 10 04 addi $8, $8, 4100 +# CHECK-NEXT: 400020: 8f 88 80 28 lw $8, -32728($gp) +# CHECK-NEXT: 400024: 21 08 10 08 addi $8, $8, 4104 +# CHECK-NEXT: 400028: 8f 88 80 2c lw $8, -32724($gp) # # CHECK: SYMBOL TABLE: # CHECK: 00051008 .data 00000000 .hidden bar @@ -48,8 +48,8 @@ # GOT-NEXT: Entry { # GOT-NEXT: Address: 0x20008 # GOT-NEXT: Access: -32744 -# GOT-NEXT: Initial: 0x10000 -# ^-- (0x1002c + 0x8000) & ~0xffff +# GOT-NEXT: Initial: 0x400000 +# ^-- (0x40002c + 0x8000) & ~0xffff # GOT-NEXT: } # GOT-NEXT: Entry { # GOT-NEXT: Address: 0x2000C @@ -61,8 +61,8 @@ # GOT-NEXT: Address: 0x20010 # GOT-NEXT: Access: -32736 # GOT-NEXT: Initial: 0x50000 -# ^-- (0x39000 + 0x10004 + 0x8000) & ~0xffff -# ^-- (0x39000 + 0x18004 + 0x8000) & ~0xffff +# ^-- (0x39000 + 0x400004 + 0x8000) & ~0xffff +# ^-- (0x39000 + 0x408004 + 0x8000) & ~0xffff # GOT-NEXT: } # GOT-NEXT: Entry { # GOT-NEXT: Address: 0x20014 @@ -98,10 +98,10 @@ addi $t0,$t0,%lo($LC0) lw $t0,%got($LC1)($gp) addi $t0,$t0,%lo($LC1) - lw $t0,%got($LC1+0x10004)($gp) - addi $t0,$t0,%lo($LC1+0x10004) - lw $t0,%got($LC1+0x18004)($gp) - addi $t0,$t0,%lo($LC1+0x18004) + lw $t0,%got($LC1+0x400004)($gp) + addi $t0,$t0,%lo($LC1+0x400004) + lw $t0,%got($LC1+0x408004)($gp) + addi $t0,$t0,%lo($LC1+0x408004) lw $t0,%got(bar)($gp) addi $t0,$t0,%lo(bar) lw $t0,%got(foo)($gp) @@ -112,7 +112,7 @@ .space 0x9000 $LC1: .word 0 - .space 0x18000 + .space 0x408000 .word 0 .global bar .hidden bar Index: test/ELF/mips-gp-disp.s =================================================================== --- test/ELF/mips-gp-disp.s +++ test/ELF/mips-gp-disp.s @@ -21,8 +21,8 @@ # DIS: Disassembly of section .text: # DIS-NEXT: __start: -# DIS-NEXT: 10000: 3c 08 00 01 lui $8, 1 -# DIS-NEXT: 10004: 21 08 7f f0 addi $8, $8, 32752 +# DIS-NEXT: 400000: 3c 08 00 01 lui $8, 1 +# DIS-NEXT: 400004: 21 08 7f f0 addi $8, $8, 32752 # ^-- 0x37ff0 & 0xffff # DIS: 00027ff0 .got 00000000 .hidden _gp Index: test/ELF/mips-gp-local.s =================================================================== --- test/ELF/mips-gp-local.s +++ test/ELF/mips-gp-local.s @@ -8,8 +8,8 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: __start: -# CHECK-NEXT: 20000: 3c 08 00 03 lui $8, 3 -# CHECK-NEXT: 20004: 21 08 7f f0 addi $8, $8, 32752 +# CHECK-NEXT: 400000: 3c 08 00 03 lui $8, 3 +# CHECK-NEXT: 400004: 21 08 7f f0 addi $8, $8, 32752 # CHECK: 00037ff0 .got 00000000 .hidden _gp Index: test/ELF/mips-gprel32-relocs-gp0.s =================================================================== --- test/ELF/mips-gprel32-relocs-gp0.s +++ test/ELF/mips-gprel32-relocs-gp0.s @@ -23,8 +23,8 @@ # DUMP: Contents of section .rodata: # DUMP: 0114 ffff0004 ffff0008 -# ^ 0x10004 + 0x7ff0 - 0x27ff0 -# ^ 0x10008 + 0x7ff0 - 0x27ff0 +# ^ 0x400004 + 0x7ff0 - 0x27ff0 +# ^ 0x400008 + 0x7ff0 - 0x27ff0 # DUMP: SYMBOL TABLE: # DUMP: 00010008 .text 00000000 bar Index: test/ELF/mips-gprel32-relocs.s =================================================================== --- test/ELF/mips-gprel32-relocs.s +++ test/ELF/mips-gprel32-relocs.s @@ -22,8 +22,8 @@ # CHECK: Contents of section .rodata: # CHECK: 0114 fffe8014 fffe8018 -# ^ 0x10004 - 0x27ff0 -# ^ 0x10008 - 0x27ff0 +# ^ 0x400004 - 0x27ff0 +# ^ 0x400008 - 0x27ff0 # CHECK: SYMBOL TABLE: # CHECK: 00010008 .text 00000000 bar Index: test/ELF/mips-higher-highest.s =================================================================== --- test/ELF/mips-higher-highest.s +++ test/ELF/mips-higher-highest.s @@ -15,7 +15,7 @@ lui $7, %highest(_foo+0x300047FFF7FF8) ld $7, %higher (_foo+0x300047FFF7FF8)($7) -# CHECK: 20000: 3c 06 00 03 lui $6, 3 -# CHECK-NEXT: 20004: 64 c6 00 05 daddiu $6, $6, 5 -# CHECK-NEXT: 20008: 3c 07 00 03 lui $7, 3 -# CHECK-NEXT: 2000c: dc e7 00 05 ld $7, 5($7) +# CHECK: 400000: 3c 06 00 03 lui $6, 3 +# CHECK-NEXT: 400004: 64 c6 00 05 daddiu $6, $6, 5 +# CHECK-NEXT: 400008: 3c 07 00 03 lui $7, 3 +# CHECK-NEXT: 40000c: dc e7 00 05 ld $7, 5($7) Index: test/ELF/mips-hilo-gp-disp.s =================================================================== --- test/ELF/mips-hilo-gp-disp.s +++ test/ELF/mips-hilo-gp-disp.s @@ -22,14 +22,14 @@ # EXE: Disassembly of section .text: # EXE-NEXT: __start: -# EXE-NEXT: 20000: 3c 08 00 01 lui $8, 1 +# EXE-NEXT: 400000: 3c 08 00 01 lui $8, 1 # ^-- %hi(0x37ff0-0x20000) -# EXE-NEXT: 20004: 21 08 7f f0 addi $8, $8, 32752 +# EXE-NEXT: 400004: 21 08 7f f0 addi $8, $8, 32752 # ^-- %lo(0x37ff0-0x20004+4) # EXE: bar: -# EXE-NEXT: 2000c: 3c 08 00 01 lui $8, 1 +# EXE-NEXT: 40000c: 3c 08 00 01 lui $8, 1 # ^-- %hi(0x37ff0-0x2000c) -# EXE-NEXT: 20010: 21 08 7f e4 addi $8, $8, 32740 +# EXE-NEXT: 400010: 21 08 7f e4 addi $8, $8, 32740 # ^-- %lo(0x37ff0-0x20010+4) # EXE: SYMBOL TABLE: @@ -39,15 +39,15 @@ # SO: Disassembly of section .text: # SO-NEXT: __start: -# SO-NEXT: 10000: 3c 08 00 01 lui $8, 1 -# ^-- %hi(0x27ff0-0x10000) -# SO-NEXT: 10004: 21 08 7f f0 addi $8, $8, 32752 -# ^-- %lo(0x27ff0-0x10004+4) +# SO-NEXT: 400000: 3c 08 00 01 lui $8, 1 +# ^-- %hi(0x27ff0-0x400000) +# SO-NEXT: 400004: 21 08 7f f0 addi $8, $8, 32752 +# ^-- %lo(0x27ff0-0x400004+4) # SO: bar: -# SO-NEXT: 1000c: 3c 08 00 01 lui $8, 1 -# ^-- %hi(0x27ff0-0x1000c) -# SO-NEXT: 10010: 21 08 7f e4 addi $8, $8, 32740 -# ^-- %lo(0x27ff0-0x10010+4) +# SO-NEXT: 40000c: 3c 08 00 01 lui $8, 1 +# ^-- %hi(0x27ff0-0x40000c) +# SO-NEXT: 400010: 21 08 7f e4 addi $8, $8, 32740 +# ^-- %lo(0x27ff0-0x400010+4) # SO: SYMBOL TABLE: # SO: 0001000c .text 00000000 bar Index: test/ELF/mips-hilo-hi-only.s =================================================================== --- test/ELF/mips-hilo-hi-only.s +++ test/ELF/mips-hilo-hi-only.s @@ -9,7 +9,7 @@ .text .globl __start __start: - lui $t0,%hi(__start+0x10000) + lui $t0,%hi(__start+0x400000) addi $t0,$t0,%lo(_label) _label: nop @@ -18,9 +18,9 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: __start: -# CHECK-NEXT: 20000: 3c 08 00 02 lui $8, 2 +# CHECK-NEXT: 400000: 3c 08 00 02 lui $8, 2 # ^-- %hi(__start) w/o addend -# CHECK-NEXT 20004: 21 08 00 08 addi $8, $8, 8 +# CHECK-NEXT 400004: 21 08 00 08 addi $8, $8, 8 # ^-- %lo(_label) # CHECK: SYMBOL TABLE: Index: test/ELF/mips-hilo.s =================================================================== --- test/ELF/mips-hilo.s +++ test/ELF/mips-hilo.s @@ -14,7 +14,7 @@ addi $t0,$t0,%lo(__start+4) addi $t0,$t0,%lo(g1+8) - lui $t0,%hi(l1+0x10000) + lui $t0,%hi(l1+0x400000) lui $t1,%hi(l1+0x20000) addi $t0,$t0,%lo(l1+(-4)) @@ -32,19 +32,19 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: __start: -# CHECK-NEXT: 20000: 3c 08 00 02 lui $8, 2 +# CHECK-NEXT: 400000: 3c 08 00 02 lui $8, 2 # ^-- %hi(__start+4) -# CHECK-NEXT: 20004: 3c 09 00 04 lui $9, 4 +# CHECK-NEXT: 400004: 3c 09 00 04 lui $9, 4 # ^-- %hi(g1+8) -# CHECK-NEXT: 20008: 21 08 00 04 addi $8, $8, 4 +# CHECK-NEXT: 400008: 21 08 00 04 addi $8, $8, 4 # ^-- %lo(__start+4) -# CHECK-NEXT: 2000c: 21 08 00 0c addi $8, $8, 12 +# CHECK-NEXT: 40000c: 21 08 00 0c addi $8, $8, 12 # ^-- %lo(g1+8) -# CHECK-NEXT: 20010: 3c 08 00 05 lui $8, 5 -# ^-- %hi(l1+0x10000-4) -# CHECK-NEXT: 20014: 3c 09 00 06 lui $9, 6 +# CHECK-NEXT: 400010: 3c 08 00 05 lui $8, 5 +# ^-- %hi(l1+0x400000-4) +# CHECK-NEXT: 400014: 3c 09 00 06 lui $9, 6 # ^-- %hi(l1+0x20000-4) -# CHECK-NEXT: 20018: 21 08 ff fc addi $8, $8, -4 +# CHECK-NEXT: 400018: 21 08 ff fc addi $8, $8, -4 # ^-- %lo(l1-4) # CHECK: SYMBOL TABLE: Index: test/ELF/mips-n32-rels.s =================================================================== --- test/ELF/mips-n32-rels.s +++ test/ELF/mips-n32-rels.s @@ -27,18 +27,18 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: __start: -# CHECK-NEXT: 20000: 3c 1c 00 01 lui $gp, 1 +# CHECK-NEXT: 400000: 3c 1c 00 01 lui $gp, 1 # ^-- 0x20000 - 0x37ff0 # ^-- 0 - 0xfffe8010 -# ^-- %hi(0x17ff0) +# ^-- %hi(0x407ff0) # CHECK: loc: -# CHECK-NEXT: 20004: 67 9c 7f f0 daddiu $gp, $gp, 32752 +# CHECK-NEXT: 400004: 67 9c 7f f0 daddiu $gp, $gp, 32752 # ^-- 0x20000 - 0x37ff0 # ^-- 0 - 0xfffe8010 -# ^-- %lo(0x17ff0) +# ^-- %lo(0x407ff0) # CHECK: Contents of section .rodata: -# CHECK-NEXT: 100f4 00020004 +# CHECK-NEXT: 4000f4 00020004 # ^-- loc # CHECK: 00020004 .text 00000000 loc Index: test/ELF/mips-npic-call-pic.s =================================================================== --- test/ELF/mips-npic-call-pic.s +++ test/ELF/mips-npic-call-pic.s @@ -15,60 +15,60 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: __start: -# CHECK-NEXT: 20000: 0c 00 80 0e jal 131128 +# CHECK-NEXT: 400000: 0c 00 80 0e jal 131128 # ^-- .pic.foo1a -# CHECK-NEXT: 20004: 00 00 00 00 nop -# CHECK-NEXT: 20008: 0c 00 80 19 jal 131172 +# CHECK-NEXT: 400004: 00 00 00 00 nop +# CHECK-NEXT: 400008: 0c 00 80 19 jal 131172 # ^-- .pic.foo2 -# CHECK-NEXT: 2000c: 00 00 00 00 nop -# CHECK-NEXT: 20010: 0c 00 80 12 jal 131144 +# CHECK-NEXT: 40000c: 00 00 00 00 nop +# CHECK-NEXT: 400010: 0c 00 80 12 jal 131144 # ^-- .pic.foo1b -# CHECK-NEXT: 20014: 00 00 00 00 nop -# CHECK-NEXT: 20018: 0c 00 80 19 jal 131172 +# CHECK-NEXT: 400014: 00 00 00 00 nop +# CHECK-NEXT: 400018: 0c 00 80 19 jal 131172 # ^-- .pic.foo2 -# CHECK-NEXT: 2001c: 00 00 00 00 nop -# CHECK-NEXT: 20020: 0c 00 80 25 jal 131220 +# CHECK-NEXT: 40001c: 00 00 00 00 nop +# CHECK-NEXT: 400020: 0c 00 80 25 jal 131220 # ^-- .pic.fpic -# CHECK-NEXT: 20024: 00 00 00 00 nop -# CHECK-NEXT: 20028: 0c 00 80 24 jal 131216 -# CHECK-NEXT: 2002c: 00 00 00 00 nop +# CHECK-NEXT: 400024: 00 00 00 00 nop +# CHECK-NEXT: 400028: 0c 00 80 24 jal 131216 +# CHECK-NEXT: 40002c: 00 00 00 00 nop # # CHECK: foo1a: -# CHECK-NEXT: 20030: 00 00 00 00 nop +# CHECK-NEXT: 400030: 00 00 00 00 nop # # CHECK: foo1b: -# CHECK-NEXT: 20034: 00 00 00 00 nop +# CHECK-NEXT: 400034: 00 00 00 00 nop # -# CHECK-NEXT: 20038: 3c 19 00 02 lui $25, 2 -# CHECK-NEXT: 2003c: 08 00 80 0c j 131120 -# CHECK-NEXT: 20040: 27 39 00 30 addiu $25, $25, 48 -# CHECK-NEXT: 20044: 00 00 00 00 nop -# CHECK-NEXT: 20048: 3c 19 00 02 lui $25, 2 -# CHECK-NEXT: 2004c: 08 00 80 0d j 131124 -# CHECK-NEXT: 20050: 27 39 00 34 addiu $25, $25, 52 -# CHECK-NEXT: 20054: 00 00 00 00 nop -# CHECK-NEXT: 20058: 00 00 00 00 nop -# CHECK-NEXT: 2005c: 00 00 00 00 nop +# CHECK-NEXT: 400038: 3c 19 00 02 lui $25, 2 +# CHECK-NEXT: 40003c: 08 00 80 0c j 131120 +# CHECK-NEXT: 400040: 27 39 00 30 addiu $25, $25, 48 +# CHECK-NEXT: 400044: 00 00 00 00 nop +# CHECK-NEXT: 400048: 3c 19 00 02 lui $25, 2 +# CHECK-NEXT: 40004c: 08 00 80 0d j 131124 +# CHECK-NEXT: 400050: 27 39 00 34 addiu $25, $25, 52 +# CHECK-NEXT: 400054: 00 00 00 00 nop +# CHECK-NEXT: 400058: 00 00 00 00 nop +# CHECK-NEXT: 40005c: 00 00 00 00 nop # # CHECK: foo2: -# CHECK-NEXT: 20060: 00 00 00 00 nop +# CHECK-NEXT: 400060: 00 00 00 00 nop # -# CHECK-NEXT: 20064: 3c 19 00 02 lui $25, 2 -# CHECK-NEXT: 20068: 08 00 80 18 j 131168 -# CHECK-NEXT: 2006c: 27 39 00 60 addiu $25, $25, 96 -# CHECK-NEXT: 20070: 00 00 00 00 nop -# CHECK-NEXT: 20074: 00 00 00 00 nop -# CHECK-NEXT: 20078: 00 00 00 00 nop -# CHECK-NEXT: 2007c: 00 00 00 00 nop +# CHECK-NEXT: 400064: 3c 19 00 02 lui $25, 2 +# CHECK-NEXT: 400068: 08 00 80 18 j 131168 +# CHECK-NEXT: 40006c: 27 39 00 60 addiu $25, $25, 96 +# CHECK-NEXT: 400070: 00 00 00 00 nop +# CHECK-NEXT: 400074: 00 00 00 00 nop +# CHECK-NEXT: 400078: 00 00 00 00 nop +# CHECK-NEXT: 40007c: 00 00 00 00 nop # # CHECK: fpic: -# CHECK-NEXT: 20080: 00 00 00 00 nop +# CHECK-NEXT: 400080: 00 00 00 00 nop # # CHECK: fnpic: -# CHECK-NEXT: 20090: 00 00 00 00 nop -# CHECK-NEXT: 20094: 3c 19 00 02 lui $25, 2 -# CHECK-NEXT: 20098: 08 00 80 20 j 131200 -# CHECK-NEXT: 2009c: 27 39 00 80 addiu $25, $25, 128 +# CHECK-NEXT: 400090: 00 00 00 00 nop +# CHECK-NEXT: 400094: 3c 19 00 02 lui $25, 2 +# CHECK-NEXT: 400098: 08 00 80 20 j 131200 +# CHECK-NEXT: 40009c: 27 39 00 80 addiu $25, $25, 128 # Make sure the thunks are created properly no matter how # objects are laid out. @@ -77,53 +77,53 @@ # RUN: llvm-objdump -d %t.exe | FileCheck -check-prefix=REVERSE %s # REVERSE: foo1a: -# REVERSE-NEXT: 20000: 00 00 00 00 nop +# REVERSE-NEXT: 400000: 00 00 00 00 nop # # REVERSE: foo1b: -# REVERSE-NEXT: 20004: 00 00 00 00 nop -# REVERSE-NEXT: 20008: 3c 19 00 02 lui $25, 2 -# REVERSE-NEXT: 2000c: 08 00 80 00 j 131072 -# REVERSE-NEXT: 20010: 27 39 00 00 addiu $25, $25, 0 -# REVERSE-NEXT: 20014: 00 00 00 00 nop -# REVERSE-NEXT: 20018: 3c 19 00 02 lui $25, 2 -# REVERSE-NEXT: 2001c: 08 00 80 01 j 131076 -# REVERSE-NEXT: 20020: 27 39 00 04 addiu $25, $25, 4 -# REVERSE-NEXT: 20024: 00 00 00 00 nop -# REVERSE-NEXT: 20028: 00 00 00 00 nop -# REVERSE-NEXT: 2002c: 00 00 00 00 nop +# REVERSE-NEXT: 400004: 00 00 00 00 nop +# REVERSE-NEXT: 400008: 3c 19 00 02 lui $25, 2 +# REVERSE-NEXT: 40000c: 08 00 80 00 j 131072 +# REVERSE-NEXT: 400010: 27 39 00 00 addiu $25, $25, 0 +# REVERSE-NEXT: 400014: 00 00 00 00 nop +# REVERSE-NEXT: 400018: 3c 19 00 02 lui $25, 2 +# REVERSE-NEXT: 40001c: 08 00 80 01 j 131076 +# REVERSE-NEXT: 400020: 27 39 00 04 addiu $25, $25, 4 +# REVERSE-NEXT: 400024: 00 00 00 00 nop +# REVERSE-NEXT: 400028: 00 00 00 00 nop +# REVERSE-NEXT: 40002c: 00 00 00 00 nop # # REVERSE: foo2: -# REVERSE-NEXT: 20030: 00 00 00 00 nop -# REVERSE-NEXT: 20034: 3c 19 00 02 lui $25, 2 -# REVERSE-NEXT: 20038: 08 00 80 0c j 131120 -# REVERSE-NEXT: 2003c: 27 39 00 30 addiu $25, $25, 48 -# REVERSE-NEXT: 20040: 00 00 00 00 nop -# REVERSE-NEXT: 20044: 00 00 00 00 nop -# REVERSE-NEXT: 20048: 00 00 00 00 nop -# REVERSE-NEXT: 2004c: 00 00 00 00 nop +# REVERSE-NEXT: 400030: 00 00 00 00 nop +# REVERSE-NEXT: 400034: 3c 19 00 02 lui $25, 2 +# REVERSE-NEXT: 400038: 08 00 80 0c j 131120 +# REVERSE-NEXT: 40003c: 27 39 00 30 addiu $25, $25, 48 +# REVERSE-NEXT: 400040: 00 00 00 00 nop +# REVERSE-NEXT: 400044: 00 00 00 00 nop +# REVERSE-NEXT: 400048: 00 00 00 00 nop +# REVERSE-NEXT: 40004c: 00 00 00 00 nop # # REVERSE: __start: -# REVERSE-NEXT: 20050: 0c 00 80 02 jal 131080 -# REVERSE-NEXT: 20054: 00 00 00 00 nop -# REVERSE-NEXT: 20058: 0c 00 80 0d jal 131124 -# REVERSE-NEXT: 2005c: 00 00 00 00 nop -# REVERSE-NEXT: 20060: 0c 00 80 06 jal 131096 -# REVERSE-NEXT: 20064: 00 00 00 00 nop -# REVERSE-NEXT: 20068: 0c 00 80 0d jal 131124 -# REVERSE-NEXT: 2006c: 00 00 00 00 nop -# REVERSE-NEXT: 20070: 0c 00 80 25 jal 131220 -# REVERSE-NEXT: 20074: 00 00 00 00 nop -# REVERSE-NEXT: 20078: 0c 00 80 24 jal 131216 -# REVERSE-NEXT: 2007c: 00 00 00 00 nop +# REVERSE-NEXT: 400050: 0c 00 80 02 jal 131080 +# REVERSE-NEXT: 400054: 00 00 00 00 nop +# REVERSE-NEXT: 400058: 0c 00 80 0d jal 131124 +# REVERSE-NEXT: 40005c: 00 00 00 00 nop +# REVERSE-NEXT: 400060: 0c 00 80 06 jal 131096 +# REVERSE-NEXT: 400064: 00 00 00 00 nop +# REVERSE-NEXT: 400068: 0c 00 80 0d jal 131124 +# REVERSE-NEXT: 40006c: 00 00 00 00 nop +# REVERSE-NEXT: 400070: 0c 00 80 25 jal 131220 +# REVERSE-NEXT: 400074: 00 00 00 00 nop +# REVERSE-NEXT: 400078: 0c 00 80 24 jal 131216 +# REVERSE-NEXT: 40007c: 00 00 00 00 nop # # REVERSE: fpic: -# REVERSE-NEXT: 20080: 00 00 00 00 nop +# REVERSE-NEXT: 400080: 00 00 00 00 nop # # REVERSE: fnpic: -# REVERSE-NEXT: 20090: 00 00 00 00 nop -# REVERSE-NEXT: 20094: 3c 19 00 02 lui $25, 2 -# REVERSE-NEXT: 20098: 08 00 80 20 j 131200 -# REVERSE-NEXT: 2009c: 27 39 00 80 addiu $25, $25, 128 +# REVERSE-NEXT: 400090: 00 00 00 00 nop +# REVERSE-NEXT: 400094: 3c 19 00 02 lui $25, 2 +# REVERSE-NEXT: 400098: 08 00 80 20 j 131200 +# REVERSE-NEXT: 40009c: 27 39 00 80 addiu $25, $25, 128 .text .globl __start Index: test/ELF/mips-pc-relocs.s =================================================================== --- test/ELF/mips-pc-relocs.s +++ test/ELF/mips-pc-relocs.s @@ -24,17 +24,17 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: __start: -# CHECK-NEXT: 20000: ec c8 00 08 lwpc $6, 32 +# CHECK-NEXT: 400000: ec c8 00 08 lwpc $6, 32 # ^-- (0x20020-0x20000)>>2 -# CHECK-NEXT: 20004: 20 a6 00 06 beqc $5, $6, 28 +# CHECK-NEXT: 400004: 20 a6 00 06 beqc $5, $6, 28 # ^-- (0x20020-4-0x20004)>>2 -# CHECK-NEXT: 20008: d9 20 00 05 beqzc $9, 24 +# CHECK-NEXT: 400008: d9 20 00 05 beqzc $9, 24 # ^-- (0x20020-4-0x20008)>>2 -# CHECK-NEXT: 2000c: c8 00 00 04 bc 20 +# CHECK-NEXT: 40000c: c8 00 00 04 bc 20 # ^-- (0x20020-4-0x2000c)>>2 -# CHECK-NEXT: 20010: ec 5f 00 00 aluipc $2, 0 +# CHECK-NEXT: 400010: ec 5f 00 00 aluipc $2, 0 # ^-- %hi(0x20020-0x20010) -# CHECK-NEXT: 20014: 24 42 00 0c addiu $2, $2, 12 +# CHECK-NEXT: 400014: 24 42 00 0c addiu $2, $2, 12 # ^-- %lo(0x20020-0x20014) # CHECK: Contents of section .data: Index: test/ELF/mips-plt-r6.s =================================================================== --- test/ELF/mips-plt-r6.s +++ test/ELF/mips-plt-r6.s @@ -12,25 +12,25 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: __start: -# CHECK-NEXT: 20000: 0c 00 80 0c jal 131120 +# CHECK-NEXT: 400000: 0c 00 80 0c jal 131120 # ^-- 0x20030 gotplt[foo0] -# CHECK-NEXT: 20004: 00 00 00 00 nop +# CHECK-NEXT: 400004: 00 00 00 00 nop # # CHECK-NEXT: Disassembly of section .plt: # CHECK-NEXT: .plt: -# CHECK-NEXT: 20010: 3c 1c 00 04 aui $zero, $gp, 4 -# CHECK-NEXT: 20014: 8f 99 00 04 lw $25, 4($gp) -# CHECK-NEXT: 20018: 27 9c 00 04 addiu $gp, $gp, 4 -# CHECK-NEXT: 2001c: 03 1c c0 23 subu $24, $24, $gp -# CHECK-NEXT: 20020: 03 e0 78 25 move $15, $ra -# CHECK-NEXT: 20024: 00 18 c0 82 srl $24, $24, 2 -# CHECK-NEXT: 20028: 03 20 f8 09 jalr $25 -# CHECK-NEXT: 2002c: 27 18 ff fe addiu $24, $24, -2 +# CHECK-NEXT: 400010: 3c 1c 00 04 aui $zero, $gp, 4 +# CHECK-NEXT: 400014: 8f 99 00 04 lw $25, 4($gp) +# CHECK-NEXT: 400018: 27 9c 00 04 addiu $gp, $gp, 4 +# CHECK-NEXT: 40001c: 03 1c c0 23 subu $24, $24, $gp +# CHECK-NEXT: 400020: 03 e0 78 25 move $15, $ra +# CHECK-NEXT: 400024: 00 18 c0 82 srl $24, $24, 2 +# CHECK-NEXT: 400028: 03 20 f8 09 jalr $25 +# CHECK-NEXT: 40002c: 27 18 ff fe addiu $24, $24, -2 -# CHECK-NEXT: 20030: 3c 0f 00 04 aui $zero, $15, 4 -# CHECK-NEXT: 20034: 8d f9 00 0c lw $25, 12($15) -# CHECK-NEXT: 20038: 03 20 00 09 jr $25 -# CHECK-NEXT: 2003c: 25 f8 00 0c addiu $24, $15, 12 +# CHECK-NEXT: 400030: 3c 0f 00 04 aui $zero, $15, 4 +# CHECK-NEXT: 400034: 8d f9 00 0c lw $25, 12($15) +# CHECK-NEXT: 400038: 03 20 00 09 jr $25 +# CHECK-NEXT: 40003c: 25 f8 00 0c addiu $24, $15, 12 .text .global __start Index: test/ELF/mips-tls-64.s =================================================================== --- test/ELF/mips-tls-64.s +++ test/ELF/mips-tls-64.s @@ -16,11 +16,11 @@ # REQUIRES: mips # DIS: __start: -# DIS-NEXT: 20000: 24 62 80 20 addiu $2, $3, -32736 -# DIS-NEXT: 20004: 24 62 80 30 addiu $2, $3, -32720 -# DIS-NEXT: 20008: 24 62 80 38 addiu $2, $3, -32712 -# DIS-NEXT: 2000c: 24 62 80 48 addiu $2, $3, -32696 -# DIS-NEXT: 20010: 24 62 80 58 addiu $2, $3, -32680 +# DIS-NEXT: 400000: 24 62 80 20 addiu $2, $3, -32736 +# DIS-NEXT: 400004: 24 62 80 30 addiu $2, $3, -32720 +# DIS-NEXT: 400008: 24 62 80 38 addiu $2, $3, -32712 +# DIS-NEXT: 40000c: 24 62 80 48 addiu $2, $3, -32696 +# DIS-NEXT: 400010: 24 62 80 58 addiu $2, $3, -32680 # DIS: Contents of section .got: # DIS-NEXT: 30008 00000000 00000000 80000000 00000000 Index: test/ELF/mips-tls-hilo.s =================================================================== --- test/ELF/mips-tls-hilo.s +++ test/ELF/mips-tls-hilo.s @@ -12,13 +12,13 @@ # REQUIRES: mips # DIS: __start: -# DIS-NEXT: 20000: 24 62 00 00 addiu $2, $3, 0 +# DIS-NEXT: 400000: 24 62 00 00 addiu $2, $3, 0 # %hi(loc0 - .tdata - 0x8000) --^ -# DIS-NEXT: 20004: 24 62 80 00 addiu $2, $3, -32768 +# DIS-NEXT: 400004: 24 62 80 00 addiu $2, $3, -32768 # %lo(loc0 - .tdata - 0x8000) --^ -# DIS-NEXT: 20008: 24 62 00 00 addiu $2, $3, 0 +# DIS-NEXT: 400008: 24 62 00 00 addiu $2, $3, 0 # %hi(loc0 - .tdata - 0x7000) --^ -# DIS-NEXT: 2000c: 24 62 90 00 addiu $2, $3, -28672 +# DIS-NEXT: 40000c: 24 62 90 00 addiu $2, $3, -28672 # %lo(loc0 - .tdata - 0x7000) --^ # DIS: 00030000 l .tdata 00000000 .tdata Index: test/ELF/mips-tls.s =================================================================== --- test/ELF/mips-tls.s +++ test/ELF/mips-tls.s @@ -16,11 +16,11 @@ # REQUIRES: mips # DIS: __start: -# DIS-NEXT: 20000: 24 62 80 18 addiu $2, $3, -32744 -# DIS-NEXT: 20004: 24 62 80 20 addiu $2, $3, -32736 -# DIS-NEXT: 20008: 24 62 80 24 addiu $2, $3, -32732 -# DIS-NEXT: 2000c: 24 62 80 2c addiu $2, $3, -32724 -# DIS-NEXT: 20010: 24 62 80 34 addiu $2, $3, -32716 +# DIS-NEXT: 400000: 24 62 80 18 addiu $2, $3, -32744 +# DIS-NEXT: 400004: 24 62 80 20 addiu $2, $3, -32736 +# DIS-NEXT: 400008: 24 62 80 24 addiu $2, $3, -32732 +# DIS-NEXT: 40000c: 24 62 80 2c addiu $2, $3, -32724 +# DIS-NEXT: 400010: 24 62 80 34 addiu $2, $3, -32716 # DIS: Contents of section .got: # DIS-NEXT: 30008 00000000 80000000 00000000 00000000 Index: test/ELF/mips-xgot-order.s =================================================================== --- test/ELF/mips-xgot-order.s +++ test/ELF/mips-xgot-order.s @@ -9,15 +9,15 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: __start: -# CHECK-NEXT: 20000: 3c 02 00 00 lui $2, 0 -# CHECK-NEXT: 20004: 8c 42 80 20 lw $2, -32736($2) -# CHECK-NEXT: 20008: 3c 02 00 00 lui $2, 0 -# CHECK-NEXT: 2000c: 8c 42 80 24 lw $2, -32732($2) +# CHECK-NEXT: 400000: 3c 02 00 00 lui $2, 0 +# CHECK-NEXT: 400004: 8c 42 80 20 lw $2, -32736($2) +# CHECK-NEXT: 400008: 3c 02 00 00 lui $2, 0 +# CHECK-NEXT: 40000c: 8c 42 80 24 lw $2, -32732($2) # # CHECK: bar: -# CHECK-NEXT: 20010: 8c 42 80 1c lw $2, -32740($2) -# CHECK-NEXT: 20014: 8c 42 80 18 lw $2, -32744($2) -# CHECK-NEXT: 20018: 20 42 00 00 addi $2, $2, 0 +# CHECK-NEXT: 400010: 8c 42 80 1c lw $2, -32740($2) +# CHECK-NEXT: 400014: 8c 42 80 18 lw $2, -32744($2) +# CHECK-NEXT: 400018: 20 42 00 00 addi $2, $2, 0 # CHECK: Contents of section .got: # CHECK-NEXT: 30000 00000000 80000000 00040000 00020010 Index: test/ELF/no-inhibit-exec.s =================================================================== --- test/ELF/no-inhibit-exec.s +++ test/ELF/no-inhibit-exec.s @@ -6,7 +6,7 @@ # CHECK: Disassembly of section .text: # CHECK-NEXT: _start -# CHECK-NEXT: 11000: e8 fb ef fe ff callq -69637 +# CHECK-NEXT: 401000: e8 fb ef fe ff callq -69637 # next code will not link without noinhibit-exec flag # because of undefined symbol _bar Index: test/ELF/noplt-pie.s =================================================================== --- test/ELF/noplt-pie.s +++ test/ELF/noplt-pie.s @@ -10,8 +10,8 @@ # CHECK: Relocations [ # CHECK-NEXT: Section ({{.*}}) .rela.dyn { -# CHECK-NEXT: 0x120B0 R_X86_64_GLOB_DAT bar 0x0 -# CHECK-NEXT: 0x120B8 R_X86_64_GLOB_DAT zed 0x0 +# CHECK-NEXT: 0x4020B0 R_X86_64_GLOB_DAT bar 0x0 +# CHECK-NEXT: 0x4020B8 R_X86_64_GLOB_DAT zed 0x0 # CHECK-NEXT: } # CHECK-NEXT: ] Index: test/ELF/openbsd-randomize.s =================================================================== --- test/ELF/openbsd-randomize.s +++ test/ELF/openbsd-randomize.s @@ -6,8 +6,8 @@ # CHECK: ProgramHeader { # CHECK: Type: PT_OPENBSD_RANDOMIZE (0x65A3DBE6) # CHECK-NEXT: Offset: 0x158 -# CHECK-NEXT: VirtualAddress: 0x10158 -# CHECK-NEXT: PhysicalAddress: 0x10158 +# CHECK-NEXT: VirtualAddress: 0x400158 +# CHECK-NEXT: PhysicalAddress: 0x400158 # CHECK-NEXT: FileSize: 8 # CHECK-NEXT: MemSize: 8 # CHECK-NEXT: Flags [ (0x4) Index: test/ELF/plt-aarch64.s =================================================================== --- test/ELF/plt-aarch64.s +++ test/ELF/plt-aarch64.s @@ -18,7 +18,7 @@ // CHECKDSO-NEXT: SHF_ALLOC // CHECKDSO-NEXT: SHF_EXECINSTR // CHECKDSO-NEXT: ] -// CHECKDSO-NEXT: Address: 0x10010 +// CHECKDSO-NEXT: Address: 0x400010 // CHECKDSO-NEXT: Offset: // CHECKDSO-NEXT: Size: 80 // CHECKDSO-NEXT: Link: @@ -54,59 +54,59 @@ // DUMPDSO: Contents of section .got.plt: // .got.plt[0..2] = 0 (reserved) -// .got.plt[3..5] = .plt = 0x10010 +// .got.plt[3..5] = .plt = 0x400010 // DUMPDSO-NEXT: 30000 00000000 00000000 00000000 00000000 ................ // DUMPDSO-NEXT: 30010 00000000 00000000 10000100 00000000 ................ // DUMPDSO-NEXT: 30020 10000100 00000000 10000100 00000000 ................ // DISASMDSO: _start: -// 0x10030 - 0x10000 = 0x30 = 48 -// DISASMDSO-NEXT: 10000: 0c 00 00 14 b #48 -// 0x10040 - 0x10004 = 0x3c = 60 -// DISASMDSO-NEXT: 10004: 0f 00 00 14 b #60 -// 0x10050 - 0x10008 = 0x48 = 72 -// DISASMDSO-NEXT: 10008: 12 00 00 14 b #72 +// 0x400030 - 0x400000 = 0x30 = 48 +// DISASMDSO-NEXT: 400000: 0c 00 00 14 b #48 +// 0x400040 - 0x400004 = 0x3c = 60 +// DISASMDSO-NEXT: 400004: 0f 00 00 14 b #60 +// 0x400050 - 0x400008 = 0x48 = 72 +// DISASMDSO-NEXT: 400008: 12 00 00 14 b #72 // DISASMDSO: foo: -// DISASMDSO-NEXT: 1000c: 1f 20 03 d5 nop +// DISASMDSO-NEXT: 40000c: 1f 20 03 d5 nop // DISASMDSO: Disassembly of section .plt: // DISASMDSO-NEXT: .plt: -// DISASMDSO-NEXT: 10010: f0 7b bf a9 stp x16, x30, [sp, #-16]! +// DISASMDSO-NEXT: 400010: f0 7b bf a9 stp x16, x30, [sp, #-16]! // &(.got.plt[2]) = 0x3000 + 2 * 8 = 0x3010 -// Page(0x30010) - Page(0x10014) = 0x30000 - 0x10000 = 0x20000 = 131072 -// DISASMDSO-NEXT: 10014: 10 01 00 90 adrp x16, #131072 +// Page(0x30010) - Page(0x400014) = 0x30000 - 0x400000 = 0x20000 = 131072 +// DISASMDSO-NEXT: 400014: 10 01 00 90 adrp x16, #131072 // 0x3010 & 0xFFF = 0x10 = 16 -// DISASMDSO-NEXT: 10018: 11 0a 40 f9 ldr x17, [x16, #16] -// DISASMDSO-NEXT: 1001c: 10 42 00 91 add x16, x16, #16 -// DISASMDSO-NEXT: 10020: 20 02 1f d6 br x17 -// DISASMDSO-NEXT: 10024: 1f 20 03 d5 nop -// DISASMDSO-NEXT: 10028: 1f 20 03 d5 nop -// DISASMDSO-NEXT: 1002c: 1f 20 03 d5 nop +// DISASMDSO-NEXT: 400018: 11 0a 40 f9 ldr x17, [x16, #16] +// DISASMDSO-NEXT: 40001c: 10 42 00 91 add x16, x16, #16 +// DISASMDSO-NEXT: 400020: 20 02 1f d6 br x17 +// DISASMDSO-NEXT: 400024: 1f 20 03 d5 nop +// DISASMDSO-NEXT: 400028: 1f 20 03 d5 nop +// DISASMDSO-NEXT: 40002c: 1f 20 03 d5 nop // foo@plt -// Page(0x30018) - Page(0x10030) = 0x30000 - 0x10000 = 0x20000 = 131072 -// DISASMDSO-NEXT: 10030: 10 01 00 90 adrp x16, #131072 +// Page(0x30018) - Page(0x400030) = 0x30000 - 0x400000 = 0x20000 = 131072 +// DISASMDSO-NEXT: 400030: 10 01 00 90 adrp x16, #131072 // 0x3018 & 0xFFF = 0x18 = 24 -// DISASMDSO-NEXT: 10034: 11 0e 40 f9 ldr x17, [x16, #24] -// DISASMDSO-NEXT: 10038: 10 62 00 91 add x16, x16, #24 -// DISASMDSO-NEXT: 1003c: 20 02 1f d6 br x17 +// DISASMDSO-NEXT: 400034: 11 0e 40 f9 ldr x17, [x16, #24] +// DISASMDSO-NEXT: 400038: 10 62 00 91 add x16, x16, #24 +// DISASMDSO-NEXT: 40003c: 20 02 1f d6 br x17 // bar@plt -// Page(0x30020) - Page(0x10040) = 0x30000 - 0x10000 = 0x20000 = 131072 -// DISASMDSO-NEXT: 10040: 10 01 00 90 adrp x16, #131072 +// Page(0x30020) - Page(0x400040) = 0x30000 - 0x400000 = 0x20000 = 131072 +// DISASMDSO-NEXT: 400040: 10 01 00 90 adrp x16, #131072 // 0x3020 & 0xFFF = 0x20 = 32 -// DISASMDSO-NEXT: 10044: 11 12 40 f9 ldr x17, [x16, #32] -// DISASMDSO-NEXT: 10048: 10 82 00 91 add x16, x16, #32 -// DISASMDSO-NEXT: 1004c: 20 02 1f d6 br x17 +// DISASMDSO-NEXT: 400044: 11 12 40 f9 ldr x17, [x16, #32] +// DISASMDSO-NEXT: 400048: 10 82 00 91 add x16, x16, #32 +// DISASMDSO-NEXT: 40004c: 20 02 1f d6 br x17 // weak@plt -// Page(0x30028) - Page(0x10050) = 0x30000 - 0x10000 = 0x20000 = 131072 -// DISASMDSO-NEXT: 10050: 10 01 00 90 adrp x16, #131072 +// Page(0x30028) - Page(0x400050) = 0x30000 - 0x400000 = 0x20000 = 131072 +// DISASMDSO-NEXT: 400050: 10 01 00 90 adrp x16, #131072 // 0x3028 & 0xFFF = 0x28 = 40 -// DISASMDSO-NEXT: 10054: 11 16 40 f9 ldr x17, [x16, #40] -// DISASMDSO-NEXT: 10058: 10 a2 00 91 add x16, x16, #40 -// DISASMDSO-NEXT: 1005c: 20 02 1f d6 br x17 +// DISASMDSO-NEXT: 400054: 11 16 40 f9 ldr x17, [x16, #40] +// DISASMDSO-NEXT: 400058: 10 a2 00 91 add x16, x16, #40 +// DISASMDSO-NEXT: 40005c: 20 02 1f d6 br x17 // CHECKEXE: Name: .plt // CHECKEXE-NEXT: Type: SHT_PROGBITS @@ -137,10 +137,10 @@ // CHECKEXE: Relocations [ // CHECKEXE-NEXT: Section ({{.*}}) .rela.plt { -// &(.got.plt[3]) = 0x13000 + 3 * 8 = 0x13018 +// &(.got.plt[3]) = 0x403000 + 3 * 8 = 0x403018 // CHECKEXE-NEXT: 0x40018 R_AARCH64_JUMP_SLOT bar 0x0 -// &(.got.plt[4]) = 0x13000 + 4 * 8 = 0x13020 +// &(.got.plt[4]) = 0x403000 + 4 * 8 = 0x403020 // CHECKEXE-NEXT: 0x40020 R_AARCH64_JUMP_SLOT weak 0x0 // CHECKEXE-NEXT: } // CHECKEXE-NEXT: ] @@ -154,42 +154,42 @@ // DISASMEXE: _start: // 0x2000c - 0x20000 = 0xc = 12 -// DISASMEXE-NEXT: 20000: 03 00 00 14 b #12 +// DISASMEXE-NEXT: 400000: 03 00 00 14 b #12 // 0x20030 - 0x20004 = 0x2c = 44 -// DISASMEXE-NEXT: 20004: 0b 00 00 14 b #44 +// DISASMEXE-NEXT: 400004: 0b 00 00 14 b #44 // 0x20040 - 0x20008 = 0x38 = 56 -// DISASMEXE-NEXT: 20008: 0e 00 00 14 b #56 +// DISASMEXE-NEXT: 400008: 0e 00 00 14 b #56 // DISASMEXE: foo: -// DISASMEXE-NEXT: 2000c: 1f 20 03 d5 nop +// DISASMEXE-NEXT: 40000c: 1f 20 03 d5 nop // DISASMEXE: Disassembly of section .plt: // DISASMEXE-NEXT: .plt: -// DISASMEXE-NEXT: 20010: f0 7b bf a9 stp x16, x30, [sp, #-16]! +// DISASMEXE-NEXT: 400010: f0 7b bf a9 stp x16, x30, [sp, #-16]! // &(.got.plt[2]) = 0x300B0 + 2 * 8 = 0x300C0 // Page(0x40010) - Page(0x20014) = 0x40000 - 0x20000 = 0x20000 = 131072 -// DISASMEXE-NEXT: 20014: 10 01 00 90 adrp x16, #131072 -// 0x120c0 & 0xFFF = 0xC0 = 192 -// DISASMEXE-NEXT: 20018: 11 0a 40 f9 ldr x17, [x16, #16] -// DISASMEXE-NEXT: 2001c: 10 42 00 91 add x16, x16, #16 -// DISASMEXE-NEXT: 20020: 20 02 1f d6 br x17 -// DISASMEXE-NEXT: 20024: 1f 20 03 d5 nop -// DISASMEXE-NEXT: 20028: 1f 20 03 d5 nop -// DISASMEXE-NEXT: 2002c: 1f 20 03 d5 nop +// DISASMEXE-NEXT: 400014: 10 01 00 90 adrp x16, #131072 +// 0x4020c0 & 0xFFF = 0xC0 = 192 +// DISASMEXE-NEXT: 400018: 11 0a 40 f9 ldr x17, [x16, #16] +// DISASMEXE-NEXT: 40001c: 10 42 00 91 add x16, x16, #16 +// DISASMEXE-NEXT: 400020: 20 02 1f d6 br x17 +// DISASMEXE-NEXT: 400024: 1f 20 03 d5 nop +// DISASMEXE-NEXT: 400028: 1f 20 03 d5 nop +// DISASMEXE-NEXT: 40002c: 1f 20 03 d5 nop // bar@plt // Page(0x40018) - Page(0x20030) = 0x40000 - 0x20000 = 0x20000 = 131072 -// DISASMEXE-NEXT: 20030: 10 01 00 90 adrp x16, #131072 -// DISASMEXE-NEXT: 20034: 11 0e 40 f9 ldr x17, [x16, #24] -// DISASMEXE-NEXT: 20038: 10 62 00 91 add x16, x16, #24 -// DISASMEXE-NEXT: 2003c: 20 02 1f d6 br x17 +// DISASMEXE-NEXT: 400030: 10 01 00 90 adrp x16, #131072 +// DISASMEXE-NEXT: 400034: 11 0e 40 f9 ldr x17, [x16, #24] +// DISASMEXE-NEXT: 400038: 10 62 00 91 add x16, x16, #24 +// DISASMEXE-NEXT: 40003c: 20 02 1f d6 br x17 // weak@plt // Page(0x40020) - Page(0x20040) = 0x40000 - 0x20000 = 0x20000 = 131072 -// DISASMEXE-NEXT: 20040: 10 01 00 90 adrp x16, #131072 -// DISASMEXE-NEXT: 20044: 11 12 40 f9 ldr x17, [x16, #32] -// DISASMEXE-NEXT: 20048: 10 82 00 91 add x16, x16, #32 -// DISASMEXE-NEXT: 2004c: 20 02 1f d6 br x17 +// DISASMEXE-NEXT: 400040: 10 01 00 90 adrp x16, #131072 +// DISASMEXE-NEXT: 400044: 11 12 40 f9 ldr x17, [x16, #32] +// DISASMEXE-NEXT: 400048: 10 82 00 91 add x16, x16, #32 +// DISASMEXE-NEXT: 40004c: 20 02 1f d6 br x17 .global _start,foo,bar .weak weak Index: test/ELF/plt-i686.s =================================================================== --- test/ELF/plt-i686.s +++ test/ELF/plt-i686.s @@ -17,7 +17,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_EXECINSTR // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x11020 +// CHECK-NEXT: Address: 0x401020 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 48 // CHECK-NEXT: Link: 0 @@ -30,7 +30,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x13000 +// CHECK-NEXT: Address: 0x403000 // CHECK-NEXT: Offset: 0x3000 // CHECK-NEXT: Size: 20 // CHECK-NEXT: Link: 0 @@ -38,12 +38,12 @@ // CHECK-NEXT: AddressAlignment: 4 // CHECK-NEXT: EntrySize: 0 -// 0x13000 + got.plt.reserved(12) = 0x1300C -// 0x13000 + got.plt.reserved(12) + 4 = 0x13010 +// 0x403000 + got.plt.reserved(12) = 0x40300C +// 0x403000 + got.plt.reserved(12) + 4 = 0x403010 // CHECK: Relocations [ // CHECK-NEXT: Section ({{.*}}) .rel.plt { -// CHECK-NEXT: 0x1300C R_386_JUMP_SLOT bar 0x0 -// CHECK-NEXT: 0x13010 R_386_JUMP_SLOT zed 0x0 +// CHECK-NEXT: 0x40300C R_386_JUMP_SLOT bar 0x0 +// CHECK-NEXT: 0x403010 R_386_JUMP_SLOT zed 0x0 // CHECK-NEXT: } // CHECK-NEXT: ] @@ -51,40 +51,40 @@ // values: // 16 is the size of PLT[0] -// (0x11010 + 16) - (0x11000 + 1) - 4 = 27 -// (0x11010 + 16) - (0x11005 + 1) - 4 = 22 -// (0x11020 + 16) - (0x1100a + 1) - 4 = 33 +// (0x401010 + 16) - (0x401000 + 1) - 4 = 27 +// (0x401010 + 16) - (0x401005 + 1) - 4 = 22 +// (0x401020 + 16) - (0x40100a + 1) - 4 = 33 // DISASM: local: -// DISASM-NEXT: 11000: {{.*}} -// DISASM-NEXT: 11002: {{.*}} +// DISASM-NEXT: 401000: {{.*}} +// DISASM-NEXT: 401002: {{.*}} // DISASM: _start: -// 0x11013 + 5 - 24 = 0x11000 -// DISASM-NEXT: 11004: e9 27 00 00 00 jmp 39 -// DISASM-NEXT: 11009: e9 22 00 00 00 jmp 34 -// DISASM-NEXT: 1100e: e9 2d 00 00 00 jmp 45 -// DISASM-NEXT: 11013: e9 e8 ff ff ff jmp -24 +// 0x401013 + 5 - 24 = 0x401000 +// DISASM-NEXT: 401004: e9 27 00 00 00 jmp 39 +// DISASM-NEXT: 401009: e9 22 00 00 00 jmp 34 +// DISASM-NEXT: 40100e: e9 2d 00 00 00 jmp 45 +// DISASM-NEXT: 401013: e9 e8 ff ff ff jmp -24 -// 0x11010 - 0x1102b - 5 = -32 -// 0x11010 - 0x1103b - 5 = -48 -// 77828 = 0x13004 = .got.plt (0x13000) + 4 -// 77832 = 0x13008 = .got.plt (0x13000) + 8 -// 77836 = 0x1300C = .got.plt (0x13000) + got.plt.reserved(12) -// 77840 = 0x13010 = .got.plt (0x13000) + got.plt.reserved(12) + 4 +// 0x401010 - 0x40102b - 5 = -32 +// 0x401010 - 0x40103b - 5 = -48 +// 77828 = 0x403004 = .got.plt (0x403000) + 4 +// 77832 = 0x403008 = .got.plt (0x403000) + 8 +// 77836 = 0x40300C = .got.plt (0x403000) + got.plt.reserved(12) +// 77840 = 0x403010 = .got.plt (0x403000) + got.plt.reserved(12) + 4 // DISASM: Disassembly of section .plt: // DISASM-NEXT: .plt: -// DISASM-NEXT: 11020: ff 35 04 30 01 00 pushl 77828 -// DISASM-NEXT: 11026: ff 25 08 30 01 00 jmpl *77832 -// DISASM-NEXT: 1102c: 90 nop -// DISASM-NEXT: 1102d: 90 nop -// DISASM-NEXT: 1102e: 90 nop -// DISASM-NEXT: 1102f: 90 nop -// DISASM-NEXT: 11030: ff 25 0c 30 01 00 jmpl *77836 -// DISASM-NEXT: 11036: 68 00 00 00 00 pushl $0 -// DISASM-NEXT: 1103b: e9 e0 ff ff ff jmp -32 <.plt> -// DISASM-NEXT: 11040: ff 25 10 30 01 00 jmpl *77840 -// DISASM-NEXT: 11046: 68 08 00 00 00 pushl $8 -// DISASM-NEXT: 1104b: e9 d0 ff ff ff jmp -48 <.plt> +// DISASM-NEXT: 401020: ff 35 04 30 01 00 pushl 77828 +// DISASM-NEXT: 401026: ff 25 08 30 01 00 jmpl *77832 +// DISASM-NEXT: 40102c: 90 nop +// DISASM-NEXT: 40102d: 90 nop +// DISASM-NEXT: 40102e: 90 nop +// DISASM-NEXT: 40102f: 90 nop +// DISASM-NEXT: 401030: ff 25 0c 30 01 00 jmpl *77836 +// DISASM-NEXT: 401036: 68 00 00 00 00 pushl $0 +// DISASM-NEXT: 40103b: e9 e0 ff ff ff jmp -32 <.plt> +// DISASM-NEXT: 401040: ff 25 10 30 01 00 jmpl *77840 +// DISASM-NEXT: 401046: 68 08 00 00 00 pushl $8 +// DISASM-NEXT: 40104b: e9 d0 ff ff ff jmp -48 <.plt> // CHECKSHARED: Name: .plt // CHECKSHARED-NEXT: Type: SHT_PROGBITS @@ -156,10 +156,10 @@ // DISASMPIE-NEXT: 102d: 90 nop // DISASMPIE-NEXT: 102e: 90 nop // DISASMPIE-NEXT: 102f: 90 nop -// DISASMPIE-NEXT: 1030: ff a3 0c 30 00 00 jmpl *12300(%ebx) +// DISASMPIE-NEXT: 1030: ff a3 0c 30 00 00 jmpl *402300(%ebx) // DISASMPIE-NEXT: 1036: 68 00 00 00 00 pushl $0 // DISASMPIE-NEXT: 103b: e9 e0 ff ff ff jmp -32 <.plt> -// DISASMPIE-NEXT: 1040: ff a3 10 30 00 00 jmpl *12304(%ebx) +// DISASMPIE-NEXT: 1040: ff a3 10 30 00 00 jmpl *402304(%ebx) // DISASMPIE-NEXT: 1046: 68 08 00 00 00 pushl $8 // DISASMPIE-NEXT: 104b: e9 d0 ff ff ff jmp -48 <.plt> Index: test/ELF/plt.s =================================================================== --- test/ELF/plt.s +++ test/ELF/plt.s @@ -37,7 +37,7 @@ // CHECK2-NEXT: SHF_ALLOC // CHECK2-NEXT: SHF_EXECINSTR // CHECK2-NEXT: ] -// CHECK2-NEXT: Address: 0x11020 +// CHECK2-NEXT: Address: 0x401020 // CHECK2-NEXT: Offset: // CHECK2-NEXT: Size: 48 // CHECK2-NEXT: Link: 0 @@ -46,8 +46,8 @@ // CHECK2: Relocations [ // CHECK2-NEXT: Section ({{.*}}) .rela.plt { -// CHECK2-NEXT: 0x13018 R_X86_64_JUMP_SLOT bar 0x0 -// CHECK2-NEXT: 0x13020 R_X86_64_JUMP_SLOT zed 0x0 +// CHECK2-NEXT: 0x403018 R_X86_64_JUMP_SLOT bar 0x0 +// CHECK2-NEXT: 0x403020 R_X86_64_JUMP_SLOT zed 0x0 // CHECK2-NEXT: } // CHECK2-NEXT: ] @@ -84,32 +84,32 @@ // DISASM-NEXT: 1056: 68 02 00 00 00 pushq $2 // DISASM-NEXT: 105b: e9 c0 ff ff ff jmp -64 <.plt> -// 0x11030 - (0x11000 + 1) - 4 = 43 -// 0x11030 - (0x11005 + 1) - 4 = 38 -// 0x11040 - (0x1100a + 1) - 4 = 49 -// 0x11000 - (0x1100f + 1) - 4 = -20 +// 0x401030 - (0x401000 + 1) - 4 = 43 +// 0x401030 - (0x401005 + 1) - 4 = 38 +// 0x401040 - (0x40100a + 1) - 4 = 49 +// 0x401000 - (0x40100f + 1) - 4 = -20 // DISASM2: _start: -// DISASM2-NEXT: 11000: e9 {{.*}} jmp 43 -// DISASM2-NEXT: 11005: e9 {{.*}} jmp 38 -// DISASM2-NEXT: 1100a: e9 {{.*}} jmp 49 -// DISASM2-NEXT: 1100f: e9 {{.*}} jmp -20 +// DISASM2-NEXT: 401000: e9 {{.*}} jmp 43 +// DISASM2-NEXT: 401005: e9 {{.*}} jmp 38 +// DISASM2-NEXT: 40100a: e9 {{.*}} jmp 49 +// DISASM2-NEXT: 40100f: e9 {{.*}} jmp -20 -// 0x13018 - 0x11036 = 4242 -// 0x13020 - 0x11046 = 4234 +// 0x403018 - 0x401036 = 4242 +// 0x403020 - 0x401046 = 4234 // DISASM2: Disassembly of section .plt: // DISASM2-NEXT: .plt: -// DISASM2-NEXT: 11020: ff 35 e2 1f 00 00 pushq 8162(%rip) -// DISASM2-NEXT: 11026: ff 25 e4 1f 00 00 jmpq *8164(%rip) -// DISASM2-NEXT: 1102c: 0f 1f 40 00 nopl (%rax) -// DISASM2-NEXT: 11030: ff 25 e2 1f 00 00 jmpq *8162(%rip) -// DISASM2-NEXT: 11036: 68 00 00 00 00 pushq $0 -// DISASM2-NEXT: 1103b: e9 e0 ff ff ff jmp -32 <.plt> -// DISASM2-NEXT: 11040: ff 25 da 1f 00 00 jmpq *8154(%rip) -// DISASM2-NEXT: 11046: 68 01 00 00 00 pushq $1 -// DISASM2-NEXT: 1104b: e9 d0 ff ff ff jmp -48 <.plt> -// DISASM2-NOT: 110C0 +// DISASM2-NEXT: 401020: ff 35 e2 1f 00 00 pushq 8162(%rip) +// DISASM2-NEXT: 401026: ff 25 e4 1f 00 00 jmpq *8164(%rip) +// DISASM2-NEXT: 40102c: 0f 1f 40 00 nopl (%rax) +// DISASM2-NEXT: 401030: ff 25 e2 1f 00 00 jmpq *8162(%rip) +// DISASM2-NEXT: 401036: 68 00 00 00 00 pushq $0 +// DISASM2-NEXT: 40103b: e9 e0 ff ff ff jmp -32 <.plt> +// DISASM2-NEXT: 401040: ff 25 da 1f 00 00 jmpq *8154(%rip) +// DISASM2-NEXT: 401046: 68 01 00 00 00 pushq $1 +// DISASM2-NEXT: 40104b: e9 d0 ff ff ff jmp -48 <.plt> +// DISASM2-NOT: 4010C0 .global _start _start: Index: test/ELF/ppc-relocs.s =================================================================== --- test/ELF/ppc-relocs.s +++ test/ELF/ppc-relocs.s @@ -13,9 +13,9 @@ # CHECK: Disassembly of section .R_PPC_ADDR16_HA: # CHECK: _start: -# CHECK: 11000: 3c 80 00 01 lis 4, 1 +# CHECK: 401000: 3c 80 00 01 lis 4, 1 # CHECK: msg: -# CHECK: 11004: 66 6f 6f 00 oris 15, 19, 28416 +# CHECK: 401004: 66 6f 6f 00 oris 15, 19, 28416 .section .R_PPC_ADDR16_LO,"ax",@progbits addi 4, 4, msg@l @@ -25,9 +25,9 @@ # CHECK: Disassembly of section .R_PPC_ADDR16_LO: # CHECK: .R_PPC_ADDR16_LO: -# CHECK: 11008: 38 84 10 04 addi 4, 4, 4100 +# CHECK: 401008: 38 84 10 04 addi 4, 4, 4100 # CHECK: mystr: -# CHECK: 1100c: 62 6c 61 68 ori 12, 19, 24936 +# CHECK: 40100c: 62 6c 61 68 ori 12, 19, 24936 .align 2 .section .R_PPC_REL24,"ax",@progbits @@ -39,7 +39,7 @@ # CHECK: Disassembly of section .R_PPC_REL24: # CHECK: .FR_PPC_REL24: -# CHECK: 11014: 48 00 00 04 b .+4 +# CHECK: 401014: 48 00 00 04 b .+4 .section .R_PPC_REL32,"ax",@progbits .globl .FR_PPC_REL32 @@ -50,7 +50,7 @@ # CHECK: Disassembly of section .R_PPC_REL32: # CHECK: .FR_PPC_REL32: -# CHECK: 11018: 00 00 00 04 +# CHECK: 401018: 00 00 00 04 .section .R_PPC_ADDR32,"ax",@progbits .globl .FR_PPC_ADDR32 @@ -61,4 +61,4 @@ # CHECK: Disassembly of section .R_PPC_ADDR32: # CHECK: .FR_PPC_ADDR32: -# CHECK: 1101c: 00 01 10 20 +# CHECK: 40101c: 00 01 10 20 Index: test/ELF/ppc64-shared-rel-toc.s =================================================================== --- test/ELF/ppc64-shared-rel-toc.s +++ test/ELF/ppc64-shared-rel-toc.s @@ -19,7 +19,7 @@ .Lfunc_begin0: blr -// CHECK: 0x30000 R_PPC64_RELATIVE - 0x10000 +// CHECK: 0x30000 R_PPC64_RELATIVE - 0x400000 // CHECK: 0x30008 R_PPC64_RELATIVE - 0x8000 // CHECK: Name: foo Index: test/ELF/pre_init_fini_array.s =================================================================== --- test/ELF/pre_init_fini_array.s +++ test/ELF/pre_init_fini_array.s @@ -63,7 +63,7 @@ // CHECK-NEXT: ] // CHECK: Name: __fini_array_end -// CHECK-NEXT: Value: 0x1201B +// CHECK-NEXT: Value: 0x40201B // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -85,7 +85,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: __init_array_end -// CHECK-NEXT: Value: 0x12008 +// CHECK-NEXT: Value: 0x402008 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -107,7 +107,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: __preinit_array_end -// CHECK-NEXT: Value: 0x12011 +// CHECK-NEXT: Value: 0x402011 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -137,16 +137,16 @@ // CHECK: FINI_ARRAYSZ [[FINI_SIZE]] (bytes) -// 0x12008 - (0x11000 + 5) = 4099 -// 0x12011 - (0x11005 + 5) = 4103 -// 0x12000 - (0x1100a + 5) = 4081 -// 0x12008 - (0x1100f + 5) = 4084 -// 0x12011 - (0x11014 + 5) = 4088 -// 0x1201B - (0x11019 + 5) = 4093 +// 0x402008 - (0x401000 + 5) = 4099 +// 0x402011 - (0x401005 + 5) = 4103 +// 0x402000 - (0x40100a + 5) = 4081 +// 0x402008 - (0x40100f + 5) = 4084 +// 0x402011 - (0x401014 + 5) = 4088 +// 0x40201B - (0x401019 + 5) = 4093 // DISASM: _start: -// DISASM-NEXT: 11000: e8 {{.*}} callq 4099 -// DISASM-NEXT: 11005: e8 {{.*}} callq 4103 -// DISASM-NEXT: 1100a: e8 {{.*}} callq 4081 -// DISASM-NEXT: 1100f: e8 {{.*}} callq 4084 -// DISASM-NEXT: 11014: e8 {{.*}} callq 4088 -// DISASM-NEXT: 11019: e8 {{.*}} callq 4093 +// DISASM-NEXT: 401000: e8 {{.*}} callq 4099 +// DISASM-NEXT: 401005: e8 {{.*}} callq 4103 +// DISASM-NEXT: 40100a: e8 {{.*}} callq 4081 +// DISASM-NEXT: 40100f: e8 {{.*}} callq 4084 +// DISASM-NEXT: 401014: e8 {{.*}} callq 4088 +// DISASM-NEXT: 401019: e8 {{.*}} callq 4093 Index: test/ELF/pre_init_fini_array_missing.s =================================================================== --- test/ELF/pre_init_fini_array_missing.s +++ test/ELF/pre_init_fini_array_missing.s @@ -13,18 +13,18 @@ call __fini_array_end // With no .init_array section the symbols resolve to 0 -// 0 - (0x11000 + 5) = -69637 -// 0 - (0x11005 + 5) = -69642 -// 0 - (0x1100a + 5) = -69647 -// 0 - (0x1100f + 5) = -69652 -// 0 - (0x11014 + 5) = -69657 -// 0 - (0x11019 + 5) = -69662 +// 0 - (0x401000 + 5) = -69637 +// 0 - (0x401005 + 5) = -69642 +// 0 - (0x40100a + 5) = -69647 +// 0 - (0x40100f + 5) = -69652 +// 0 - (0x401014 + 5) = -69657 +// 0 - (0x401019 + 5) = -69662 // CHECK: Disassembly of section .text: // CHECK-NEXT: _start: -// CHECK-NEXT: 11000: e8 fb ef fe ff callq -69637 -// CHECK-NEXT: 11005: e8 f6 ef fe ff callq -69642 -// CHECK-NEXT: 1100a: e8 f1 ef fe ff callq -69647 -// CHECK-NEXT: 1100f: e8 ec ef fe ff callq -69652 -// CHECK-NEXT: 11014: e8 e7 ef fe ff callq -69657 -// CHECK-NEXT: 11019: e8 e2 ef fe ff callq -69662 +// CHECK-NEXT: 401000: e8 fb ef fe ff callq -69637 +// CHECK-NEXT: 401005: e8 f6 ef fe ff callq -69642 +// CHECK-NEXT: 40100a: e8 f1 ef fe ff callq -69647 +// CHECK-NEXT: 40100f: e8 ec ef fe ff callq -69652 +// CHECK-NEXT: 401014: e8 e7 ef fe ff callq -69657 +// CHECK-NEXT: 401019: e8 e2 ef fe ff callq -69662 Index: test/ELF/progname.s =================================================================== --- test/ELF/progname.s +++ test/ELF/progname.s @@ -25,7 +25,7 @@ // RUN: llvm-readobj -dyn-symbols %t | FileCheck %s // CHECK: Name: __progname@ -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global (0x1) // CHECK-NEXT: Type: None (0x0) Index: test/ELF/program-header-layout.s =================================================================== --- test/ELF/program-header-layout.s +++ test/ELF/program-header-layout.s @@ -35,8 +35,8 @@ # CHECK-NEXT: ProgramHeader { # CHECK-NEXT: Type: PT_PHDR (0x6) # CHECK-NEXT: Offset: 0x40 -# CHECK-NEXT: VirtualAddress: 0x10040 -# CHECK-NEXT: PhysicalAddress: 0x10040 +# CHECK-NEXT: VirtualAddress: 0x400040 +# CHECK-NEXT: PhysicalAddress: 0x400040 # CHECK-NEXT: FileSize: 280 # CHECK-NEXT: MemSize: 280 # CHECK-NEXT: Flags [ (0x4) Index: test/ELF/relocatable.s =================================================================== --- test/ELF/relocatable.s +++ test/ELF/relocatable.s @@ -79,7 +79,7 @@ # CHECKEXE-NEXT: Type: Executable # CHECKEXE-NEXT: Machine: EM_X86_64 # CHECKEXE-NEXT: Version: 1 -# CHECKEXE-NEXT: Entry: 0x11000 +# CHECKEXE-NEXT: Entry: 0x401000 # CHECKEXE-NEXT: ProgramHeaderOffset: 0x40 # CHECKEXE-NEXT: SectionHeaderOffset: 0x11F8 # CHECKEXE-NEXT: Flags [ Index: test/ELF/relocation-common.s =================================================================== --- test/ELF/relocation-common.s +++ test/ELF/relocation-common.s @@ -10,5 +10,5 @@ .global sym1 .comm sym1,4,4 -// CHECK: 11000: {{.*}} movl $1, 4086(%rip) +// CHECK: 401000: {{.*}} movl $1, 4086(%rip) // CHECK: 0000000000012000 g .bss 00000004 sym1 Index: test/ELF/relocation-copy-flags.s =================================================================== --- test/ELF/relocation-copy-flags.s +++ test/ELF/relocation-copy-flags.s @@ -22,7 +22,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_EXECINSTR // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x11000 +// CHECK-NEXT: Address: 0x401000 // CHECK-NEXT: Offset: 0x1000 // CHECK-NEXT: Size: 8 // CHECK-NEXT: Link: 0 @@ -39,7 +39,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x13000 +// CHECK-NEXT: Address: 0x403000 // CHECK-NEXT: Offset: 0x3000 // CHECK-NEXT: Size: 8 // CHECK-NEXT: Link: 0 @@ -67,7 +67,7 @@ // CHECK: Relocations [ // CHECK-NEXT: Section (4) .rela.dyn { -// CHECK-NEXT: 0x13010 R_X86_64_COPY x 0x0 -// CHECK-NEXT: 0x13000 R_X86_64_64 z 0x0 +// CHECK-NEXT: 0x403010 R_X86_64_COPY x 0x0 +// CHECK-NEXT: 0x403000 R_X86_64_64 z 0x0 // CHECK-NEXT: } // CHECK-NEXT: ] Index: test/ELF/relocation-copy-i686.s =================================================================== --- test/ELF/relocation-copy-i686.s +++ test/ELF/relocation-copy-i686.s @@ -21,7 +21,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x13000 +// CHECK-NEXT: Address: 0x403000 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 24 // CHECK-NEXT: Link: 0 @@ -52,12 +52,12 @@ // CHECK-NEXT: } // CHECK-NEXT: ] -// 77824 = 0x13000 +// 77824 = 0x403000 // 16 is alignment here -// 77840 = 0x13000 + 16 -// 77844 = 0x13000 + 16 + 4 +// 77840 = 0x403000 + 16 +// 77844 = 0x403000 + 16 + 4 // CODE: Disassembly of section .text: // CODE-NEXT: main: -// CODE-NEXT: 11000: c7 05 00 30 01 00 05 00 00 00 movl $5, 77824 -// CODE-NEXT: 1100a: c7 05 10 30 01 00 07 00 00 00 movl $7, 77840 -// CODE-NEXT: 11014: c7 05 14 30 01 00 09 00 00 00 movl $9, 77844 +// CODE-NEXT: 401000: c7 05 00 30 01 00 05 00 00 00 movl $5, 77824 +// CODE-NEXT: 40100a: c7 05 10 30 01 00 07 00 00 00 movl $7, 77840 +// CODE-NEXT: 401014: c7 05 14 30 01 00 09 00 00 00 movl $9, 77844 Index: test/ELF/relocation-copy.s =================================================================== --- test/ELF/relocation-copy.s +++ test/ELF/relocation-copy.s @@ -22,7 +22,7 @@ // CHECK-NEXT: SHF_ALLOC (0x2) // CHECK-NEXT: SHF_WRITE (0x1) // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x13000 +// CHECK-NEXT: Address: 0x403000 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 24 // CHECK-NEXT: Link: 0 @@ -53,15 +53,15 @@ // CHECK-NEXT: } // CHECK-NEXT: ] -// 77824 = 0x13000 +// 77824 = 0x403000 // 16 is alignment here -// 77840 = 0x13000 + 16 -// 77844 = 0x13000 + 16 + 4 +// 77840 = 0x403000 + 16 +// 77844 = 0x403000 + 16 + 4 // CODE: Disassembly of section .text: // CODE-NEXT: _start: -// CODE-NEXT: 11000: c7 04 25 00 30 01 00 05 00 00 00 movl $5, 77824 -// CODE-NEXT: 1100b: c7 04 25 10 30 01 00 07 00 00 00 movl $7, 77840 -// CODE-NEXT: 11016: c7 04 25 14 30 01 00 09 00 00 00 movl $9, 77844 -// CODE-NEXT: 11021: ba 00 30 01 00 movl $77824, %edx -// CODE-NEXT: 11026: ba 10 30 01 00 movl $77840, %edx -// CODE-NEXT: 1102b: ba 14 30 01 00 movl $77844, %edx +// CODE-NEXT: 401000: c7 04 25 00 30 01 00 05 00 00 00 movl $5, 77824 +// CODE-NEXT: 40100b: c7 04 25 10 30 01 00 07 00 00 00 movl $7, 77840 +// CODE-NEXT: 401016: c7 04 25 14 30 01 00 09 00 00 00 movl $9, 77844 +// CODE-NEXT: 401021: ba 00 30 01 00 movl $77824, %edx +// CODE-NEXT: 401026: ba 10 30 01 00 movl $77840, %edx +// CODE-NEXT: 40102b: ba 14 30 01 00 movl $77844, %edx Index: test/ELF/relocation-i686.s =================================================================== --- test/ELF/relocation-i686.s +++ test/ELF/relocation-i686.s @@ -27,14 +27,14 @@ // CHECK: Disassembly of section .R_386_32: // CHECK-NEXT: R_386_32: -// CHECK-NEXT: 11000: {{.*}} movl $69633, %edx +// CHECK-NEXT: 401000: {{.*}} movl $69633, %edx // CHECK: Disassembly of section .R_386_PC32: // CHECK-NEXT: R_386_PC32: -// CHECK-NEXT: 11005: e8 04 00 00 00 calll 4 +// CHECK-NEXT: 401005: e8 04 00 00 00 calll 4 // CHECK: R_386_PC32_2: -// CHECK-NEXT: 1100e: 90 nop +// CHECK-NEXT: 40100e: 90 nop // Create a .got movl bar@GOT, %eax @@ -45,7 +45,7 @@ // ADDR-NEXT: SHF_ALLOC // ADDR-NEXT: SHF_EXECINSTR // ADDR-NEXT: ] -// ADDR-NEXT: Address: 0x11040 +// ADDR-NEXT: Address: 0x401040 // ADDR-NEXT: Offset: 0x1040 // ADDR-NEXT: Size: 32 @@ -55,7 +55,7 @@ // ADDR-NEXT: SHF_ALLOC // ADDR-NEXT: SHF_WRITE // ADDR-NEXT: ] -// ADDR-NEXT: Address: 0x12078 +// ADDR-NEXT: Address: 0x402078 // ADDR-NEXT: Offset: // ADDR-NEXT: Size: 8 @@ -63,18 +63,18 @@ R_386_GOTPC: movl $_GLOBAL_OFFSET_TABLE_, %eax -// 0x12078 + 8 - 0x11014 = 4204 +// 0x402078 + 8 - 0x401014 = 4204 // CHECK: Disassembly of section .R_386_GOTPC: // CHECK-NEXT: R_386_GOTPC: -// CHECK-NEXT: 11014: {{.*}} movl $4204, %eax +// CHECK-NEXT: 401014: {{.*}} movl $4204, %eax .section .dynamic_reloc, "ax",@progbits call bar -// addr(.plt) + 16 - (0x11019 + 5) = 50 +// addr(.plt) + 16 - (0x401019 + 5) = 50 // CHECK: Disassembly of section .dynamic_reloc: // CHECK-NEXT: .dynamic_reloc: -// CHECK-NEXT: 11019: e8 32 00 00 00 calll 50 +// CHECK-NEXT: 401019: e8 32 00 00 00 calll 50 .section .R_386_GOT32,"ax",@progbits .global R_386_GOT32 @@ -84,13 +84,13 @@ movl bar+8@GOT, %eax movl zed+4@GOT, %eax -// 4294967288 = 0xFFFFFFF8 = got[0](0x12070) - .got(0x12070) - sizeof(.got)(8) -// 4294967292 = 0xFFFFFFFC = got[1](0x12074) - .got(0x12070) - sizeof(.got)(8) +// 4294967288 = 0xFFFFFFF8 = got[0](0x402070) - .got(0x402070) - sizeof(.got)(8) +// 4294967292 = 0xFFFFFFFC = got[1](0x402074) - .got(0x402070) - sizeof(.got)(8) // 0xFFFFFFF8 + 8 = 0 // 0xFFFFFFFC + 4 = 0 // CHECK: Disassembly of section .R_386_GOT32: // CHECK-NEXT: R_386_GOT32: -// CHECK-NEXT: 1101e: a1 f8 ff ff ff movl 4294967288, %eax -// CHECK-NEXT: 11023: a1 fc ff ff ff movl 4294967292, %eax -// CHECK-NEXT: 11028: a1 00 00 00 00 movl 0, %eax -// CHECK-NEXT: 1102d: a1 00 00 00 00 movl 0, %eax +// CHECK-NEXT: 40101e: a1 f8 ff ff ff movl 4294967288, %eax +// CHECK-NEXT: 401023: a1 fc ff ff ff movl 4294967292, %eax +// CHECK-NEXT: 401028: a1 00 00 00 00 movl 0, %eax +// CHECK-NEXT: 40102d: a1 00 00 00 00 movl 0, %eax Index: test/ELF/relocation-local.s =================================================================== --- test/ELF/relocation-local.s +++ test/ELF/relocation-local.s @@ -20,7 +20,7 @@ // constants in hex. // CHECK: Disassembly of section .text2: // CHECK-NEXT: R_X86_64_32: -// CHECK-NEXT: 11009: {{.*}} movl $69641, %edx +// CHECK-NEXT: 401009: {{.*}} movl $69641, %edx .section .R_X86_64_32S,"ax",@progbits R_X86_64_32S: @@ -35,4 +35,4 @@ .quad R_X86_64_64 // CHECK: Contents of section .R_X86_64_64: -// CHECK-NEXT: 10120 20010100 00000000 +// CHECK-NEXT: 400120 20010100 00000000 Index: test/ELF/relocation-size-shared.s =================================================================== --- test/ELF/relocation-size-shared.s +++ test/ELF/relocation-size-shared.s @@ -7,48 +7,48 @@ // RELOCSHARED: Relocations [ // RELOCSHARED-NEXT: Section ({{.*}}) .rela.dyn { -// RELOCSHARED-NEXT: 0x13018 R_X86_64_SIZE64 fooshared 0xFFFFFFFFFFFFFFFF -// RELOCSHARED-NEXT: 0x13020 R_X86_64_SIZE64 fooshared 0x0 -// RELOCSHARED-NEXT: 0x13028 R_X86_64_SIZE64 fooshared 0x1 -// RELOCSHARED-NEXT: 0x13048 R_X86_64_SIZE32 fooshared 0xFFFFFFFFFFFFFFFF -// RELOCSHARED-NEXT: 0x1304F R_X86_64_SIZE32 fooshared 0x0 -// RELOCSHARED-NEXT: 0x13056 R_X86_64_SIZE32 fooshared 0x1 +// RELOCSHARED-NEXT: 0x403018 R_X86_64_SIZE64 fooshared 0xFFFFFFFFFFFFFFFF +// RELOCSHARED-NEXT: 0x403020 R_X86_64_SIZE64 fooshared 0x0 +// RELOCSHARED-NEXT: 0x403028 R_X86_64_SIZE64 fooshared 0x1 +// RELOCSHARED-NEXT: 0x403048 R_X86_64_SIZE32 fooshared 0xFFFFFFFFFFFFFFFF +// RELOCSHARED-NEXT: 0x40304F R_X86_64_SIZE32 fooshared 0x0 +// RELOCSHARED-NEXT: 0x403056 R_X86_64_SIZE32 fooshared 0x1 // RELOCSHARED-NEXT: } // RELOCSHARED-NEXT:] // DISASM: Disassembly of section test // DISASM: _data: -// DISASM-NEXT: 13000: 19 00 -// DISASM-NEXT: 13002: 00 00 -// DISASM-NEXT: 13004: 00 00 -// DISASM-NEXT: 13006: 00 00 -// DISASM-NEXT: 13008: 1a 00 -// DISASM-NEXT: 1300a: 00 00 -// DISASM-NEXT: 1300c: 00 00 -// DISASM-NEXT: 1300e: 00 00 -// DISASM-NEXT: 13010: 1b 00 -// DISASM-NEXT: 13012: 00 00 -// DISASM-NEXT: 13014: 00 00 -// DISASM-NEXT: 13016: 00 00 -// DISASM-NEXT: 13018: 00 00 -// DISASM-NEXT: 1301a: 00 00 -// DISASM-NEXT: 1301c: 00 00 -// DISASM-NEXT: 1301e: 00 00 -// DISASM-NEXT: 13020: 00 00 -// DISASM-NEXT: 13022: 00 00 -// DISASM-NEXT: 13024: 00 00 -// DISASM-NEXT: 13026: 00 00 -// DISASM-NEXT: 13028: 00 00 -// DISASM-NEXT: 1302a: 00 00 -// DISASM-NEXT: 1302c: 00 00 -// DISASM-NEXT: 1302e: 00 00 +// DISASM-NEXT: 403000: 19 00 +// DISASM-NEXT: 403002: 00 00 +// DISASM-NEXT: 403004: 00 00 +// DISASM-NEXT: 403006: 00 00 +// DISASM-NEXT: 403008: 1a 00 +// DISASM-NEXT: 40300a: 00 00 +// DISASM-NEXT: 40300c: 00 00 +// DISASM-NEXT: 40300e: 00 00 +// DISASM-NEXT: 403010: 1b 00 +// DISASM-NEXT: 403012: 00 00 +// DISASM-NEXT: 403014: 00 00 +// DISASM-NEXT: 403016: 00 00 +// DISASM-NEXT: 403018: 00 00 +// DISASM-NEXT: 40301a: 00 00 +// DISASM-NEXT: 40301c: 00 00 +// DISASM-NEXT: 40301e: 00 00 +// DISASM-NEXT: 403020: 00 00 +// DISASM-NEXT: 403022: 00 00 +// DISASM-NEXT: 403024: 00 00 +// DISASM-NEXT: 403026: 00 00 +// DISASM-NEXT: 403028: 00 00 +// DISASM-NEXT: 40302a: 00 00 +// DISASM-NEXT: 40302c: 00 00 +// DISASM-NEXT: 40302e: 00 00 // DISASM: _start: -// DISASM-NEXT: 13030: 8b 04 25 19 00 00 00 movl 25, %eax -// DISASM-NEXT: 13037: 8b 04 25 1a 00 00 00 movl 26, %eax -// DISASM-NEXT: 1303e: 8b 04 25 1b 00 00 00 movl 27, %eax -// DISASM-NEXT: 13045: 8b 04 25 00 00 00 00 movl 0, %eax -// DISASM-NEXT: 1304c: 8b 04 25 00 00 00 00 movl 0, %eax -// DISASM-NEXT: 13053: 8b 04 25 00 00 00 00 movl 0, %eax +// DISASM-NEXT: 403030: 8b 04 25 19 00 00 00 movl 25, %eax +// DISASM-NEXT: 403037: 8b 04 25 1a 00 00 00 movl 26, %eax +// DISASM-NEXT: 40303e: 8b 04 25 1b 00 00 00 movl 27, %eax +// DISASM-NEXT: 403045: 8b 04 25 00 00 00 00 movl 0, %eax +// DISASM-NEXT: 40304c: 8b 04 25 00 00 00 00 movl 0, %eax +// DISASM-NEXT: 403053: 8b 04 25 00 00 00 00 movl 0, %eax .data .global foo Index: test/ELF/relocation-size.s =================================================================== --- test/ELF/relocation-size.s +++ test/ELF/relocation-size.s @@ -11,37 +11,37 @@ // DISASM: Disassembly of section test: // DISASM-NEXT: _data: -// DISASM-NEXT: 12000: 19 00 -// DISASM-NEXT: 12002: 00 00 -// DISASM-NEXT: 12004: 00 00 -// DISASM-NEXT: 12006: 00 00 -// DISASM-NEXT: 12008: 1a 00 -// DISASM-NEXT: 1200a: 00 00 -// DISASM-NEXT: 1200c: 00 00 -// DISASM-NEXT: 1200e: 00 00 -// DISASM-NEXT: 12010: 1b 00 -// DISASM-NEXT: 12012: 00 00 -// DISASM-NEXT: 12014: 00 00 -// DISASM-NEXT: 12016: 00 00 -// DISASM-NEXT: 12018: 19 00 -// DISASM-NEXT: 1201a: 00 00 -// DISASM-NEXT: 1201c: 00 00 -// DISASM-NEXT: 1201e: 00 00 -// DISASM-NEXT: 12020: 1a 00 -// DISASM-NEXT: 12022: 00 00 -// DISASM-NEXT: 12024: 00 00 -// DISASM-NEXT: 12026: 00 00 -// DISASM-NEXT: 12028: 1b 00 -// DISASM-NEXT: 1202a: 00 00 -// DISASM-NEXT: 1202c: 00 00 -// DISASM-NEXT: 1202e: 00 00 +// DISASM-NEXT: 402000: 19 00 +// DISASM-NEXT: 402002: 00 00 +// DISASM-NEXT: 402004: 00 00 +// DISASM-NEXT: 402006: 00 00 +// DISASM-NEXT: 402008: 1a 00 +// DISASM-NEXT: 40200a: 00 00 +// DISASM-NEXT: 40200c: 00 00 +// DISASM-NEXT: 40200e: 00 00 +// DISASM-NEXT: 402010: 1b 00 +// DISASM-NEXT: 402012: 00 00 +// DISASM-NEXT: 402014: 00 00 +// DISASM-NEXT: 402016: 00 00 +// DISASM-NEXT: 402018: 19 00 +// DISASM-NEXT: 40201a: 00 00 +// DISASM-NEXT: 40201c: 00 00 +// DISASM-NEXT: 40201e: 00 00 +// DISASM-NEXT: 402020: 1a 00 +// DISASM-NEXT: 402022: 00 00 +// DISASM-NEXT: 402024: 00 00 +// DISASM-NEXT: 402026: 00 00 +// DISASM-NEXT: 402028: 1b 00 +// DISASM-NEXT: 40202a: 00 00 +// DISASM-NEXT: 40202c: 00 00 +// DISASM-NEXT: 40202e: 00 00 // DISASM: _start: -// DISASM-NEXT: 12030: 8b 04 25 19 00 00 00 movl 25, %eax -// DISASM-NEXT: 12037: 8b 04 25 1a 00 00 00 movl 26, %eax -// DISASM-NEXT: 1203e: 8b 04 25 1b 00 00 00 movl 27, %eax -// DISASM-NEXT: 12045: 8b 04 25 19 00 00 00 movl 25, %eax -// DISASM-NEXT: 1204c: 8b 04 25 1a 00 00 00 movl 26, %eax -// DISASM-NEXT: 12053: 8b 04 25 1b 00 00 00 movl 27, %eax +// DISASM-NEXT: 402030: 8b 04 25 19 00 00 00 movl 25, %eax +// DISASM-NEXT: 402037: 8b 04 25 1a 00 00 00 movl 26, %eax +// DISASM-NEXT: 40203e: 8b 04 25 1b 00 00 00 movl 27, %eax +// DISASM-NEXT: 402045: 8b 04 25 19 00 00 00 movl 25, %eax +// DISASM-NEXT: 40204c: 8b 04 25 1a 00 00 00 movl 26, %eax +// DISASM-NEXT: 402053: 8b 04 25 1b 00 00 00 movl 27, %eax // RELOCSHARED: Relocations [ // RELOCSHARED-NEXT: Section ({{.*}}) .rela.dyn { Index: test/ELF/relocation-undefined-weak.s =================================================================== --- test/ELF/relocation-undefined-weak.s +++ test/ELF/relocation-undefined-weak.s @@ -18,10 +18,10 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_EXECINSTR // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x11000 +// CHECK-NEXT: Address: 0x401000 // Unfortunately FileCheck can't do math, so we have to check for explicit // values: -// R_86_64_PC32 = 0 + (-8 - (0x11000 + 2)) = -69642 +// R_86_64_PC32 = 0 + (-8 - (0x401000 + 2)) = -69642 // DISASM: movl $1, -69642(%rip) Index: test/ELF/relocation.s =================================================================== --- test/ELF/relocation.s +++ test/ELF/relocation.s @@ -12,7 +12,7 @@ // SEC-NEXT: SHF_ALLOC // SEC-NEXT: SHF_EXECINSTR // SEC-NEXT: ] -// SEC-NEXT: Address: 0x11030 +// SEC-NEXT: Address: 0x401030 // SEC-NEXT: Offset: 0x1030 // SEC-NEXT: Size: 48 @@ -22,7 +22,7 @@ // SEC-NEXT: SHF_ALLOC // SEC-NEXT: SHF_WRITE // SEC-NEXT: ] -// SEC-NEXT: Address: 0x120F0 +// SEC-NEXT: Address: 0x4020F0 // SEC-NEXT: Offset: // SEC-NEXT: Size: 8 // SEC-NEXT: Link: 0 @@ -37,7 +37,7 @@ // SEC-NEXT: SHF_ALLOC // SEC-NEXT: SHF_WRITE // SEC-NEXT: ] -// SEC-NEXT: Address: 0x13000 +// SEC-NEXT: Address: 0x403000 // SEC-NEXT: Offset: 0x3000 // SEC-NEXT: Size: 40 // SEC-NEXT: Link: 0 @@ -59,11 +59,11 @@ // CHECK: Disassembly of section .text: // CHECK-NEXT: _start: -// CHECK-NEXT: 11000: e8 04 00 00 00 callq 4 -// CHECK-NEXT: 11005: +// CHECK-NEXT: 401000: e8 04 00 00 00 callq 4 +// CHECK-NEXT: 401005: // CHECK: lulz: -// CHECK-NEXT: 11009: 90 nop +// CHECK-NEXT: 401009: 90 nop .section .text2,"ax",@progbits @@ -75,7 +75,7 @@ // constants in hex. // CHECK: Disassembly of section .text2: // CHECK-NEXT: R_X86_64_32: -// CHECK-NEXT: 1100a: {{.*}} movl $69642, %edx +// CHECK-NEXT: 40100a: {{.*}} movl $69642, %edx .section .R_X86_64_32S,"ax",@progbits .global R_X86_64_32S @@ -92,20 +92,20 @@ call bar movl $bar, %eax //16 is a size of PLT[0] -// 0x11030 + 16 - (0x11017 + 5) = 20 +// 0x401030 + 16 - (0x401017 + 5) = 20 // CHECK: Disassembly of section .R_X86_64_PC32: // CHECK-NEXT: R_X86_64_PC32: -// CHECK-NEXT: 11017: {{.*}} callq 36 -// CHECK-NEXT: 1101c: {{.*}} movl $69696, %eax +// CHECK-NEXT: 401017: {{.*}} callq 36 +// CHECK-NEXT: 40101c: {{.*}} movl $69696, %eax .section .R_X86_64_32S_2,"ax",@progbits .global R_X86_64_32S_2 R_X86_64_32S_2: mov bar2, %eax -// plt is at 0x11030. The second plt entry is at 0x11050 == 69712 +// plt is at 0x401030. The second plt entry is at 0x401050 == 69712 // CHECK: Disassembly of section .R_X86_64_32S_2: // CHECK-NEXT: R_X86_64_32S_2: -// CHECK-NEXT: 11021: {{.*}} movl 69712, %eax +// CHECK-NEXT: 401021: {{.*}} movl 69712, %eax .section .R_X86_64_64,"a",@progbits .global R_X86_64_64 @@ -113,17 +113,17 @@ .quad R_X86_64_64 // CHECK: Contents of section .R_X86_64_64: -// CHECK-NEXT: 101c8 c8010100 00000000 +// CHECK-NEXT: 4001c8 c8010100 00000000 .section .R_X86_64_GOTPCREL,"a",@progbits .global R_X86_64_GOTPCREL R_X86_64_GOTPCREL: .long zed@gotpcrel -// 0x120F8 - 0x101D8 = 7952 +// 0x4020F8 - 0x4001D8 = 7952 // 7952 = 0x101f0000 in little endian // CHECK: Contents of section .R_X86_64_GOTPCREL -// CHECK-NEXT: 101d0 201f0000 +// CHECK-NEXT: 4001d0 201f0000 .section .R_X86_64_GOT32,"a",@progbits .global R_X86_64_GOT32 Index: test/ELF/relro.s =================================================================== --- test/ELF/relro.s +++ test/ELF/relro.s @@ -17,7 +17,7 @@ // FULLRELRO-NEXT: SHF_ALLOC // FULLRELRO-NEXT: SHF_WRITE // FULLRELRO-NEXT: ] -// FULLRELRO-NEXT: Address: 0x12110 +// FULLRELRO-NEXT: Address: 0x402110 // FULLRELRO-NEXT: Offset: 0x2110 // FULLRELRO-NEXT: Size: 8 // FULLRELRO-NEXT: Link: 0 @@ -36,7 +36,7 @@ // FULLRELRO-NEXT: SHF_ALLOC // FULLRELRO-NEXT: SHF_WRITE // FULLRELRO-NEXT: ] -// FULLRELRO-NEXT: Address: 0x12118 +// FULLRELRO-NEXT: Address: 0x402118 // FULLRELRO-NEXT: Offset: 0x2118 // FULLRELRO-NEXT: Size: 32 // FULLRELRO-NEXT: Link: 0 @@ -56,7 +56,7 @@ // FULLRELRO-NEXT: SHF_ALLOC // FULLRELRO-NEXT: SHF_WRITE // FULLRELRO-NEXT: ] -// FULLRELRO-NEXT: Address: 0x13000 +// FULLRELRO-NEXT: Address: 0x403000 // FULLRELRO-NEXT: Offset: 0x3000 // FULLRELRO-NEXT: Size: 12 // FULLRELRO-NEXT: Link: 0 @@ -75,7 +75,7 @@ // FULLRELRO-NEXT: SHF_ALLOC // FULLRELRO-NEXT: SHF_WRITE // FULLRELRO-NEXT: ] -// FULLRELRO-NEXT: Address: 0x1300C +// FULLRELRO-NEXT: Address: 0x40300C // FULLRELRO-NEXT: Offset: 0x300C // FULLRELRO-NEXT: Size: 0 // FULLRELRO-NEXT: Link: 0 @@ -119,7 +119,7 @@ // PARTRELRO-NEXT: SHF_ALLOC // PARTRELRO-NEXT: SHF_WRITE // PARTRELRO-NEXT: ] -// PARTRELRO-NEXT: Address: 0x120F0 +// PARTRELRO-NEXT: Address: 0x4020F0 // PARTRELRO-NEXT: Offset: 0x20F0 // PARTRELRO-NEXT: Size: 8 // PARTRELRO-NEXT: Link: 0 @@ -138,7 +138,7 @@ // PARTRELRO-NEXT: SHF_ALLOC // PARTRELRO-NEXT: SHF_WRITE // PARTRELRO-NEXT: ] -// PARTRELRO-NEXT: Address: 0x13000 +// PARTRELRO-NEXT: Address: 0x403000 // PARTRELRO-NEXT: Offset: 0x3000 // PARTRELRO-NEXT: Size: 12 // PARTRELRO-NEXT: Link: 0 @@ -157,7 +157,7 @@ // PARTRELRO-NEXT: SHF_ALLOC // PARTRELRO-NEXT: SHF_WRITE // PARTRELRO-NEXT: ] -// PARTRELRO-NEXT: Address: 0x1300C +// PARTRELRO-NEXT: Address: 0x40300C // PARTRELRO-NEXT: Offset: 0x300C // PARTRELRO-NEXT: Size: 0 // PARTRELRO-NEXT: Link: 0 @@ -175,7 +175,7 @@ // PARTRELRO-NEXT: SHF_ALLOC // PARTRELRO-NEXT: SHF_WRITE // PARTRELRO-NEXT: ] -// PARTRELRO-NEXT: Address: 0x13010 +// PARTRELRO-NEXT: Address: 0x403010 // PARTRELRO-NEXT: Offset: 0x3010 // PARTRELRO-NEXT: Size: 32 // PARTRELRO-NEXT: Link: 0 @@ -195,7 +195,7 @@ // PARTRELRO-NEXT: SHF_ALLOC // PARTRELRO-NEXT: SHF_WRITE // PARTRELRO-NEXT: ] -// PARTRELRO-NEXT: Address: 0x13030 +// PARTRELRO-NEXT: Address: 0x403030 // PARTRELRO-NEXT: Offset: 0x3030 // PARTRELRO-NEXT: Size: 0 // PARTRELRO-NEXT: Link: 0 Index: test/ELF/resolution.s =================================================================== --- test/ELF/resolution.s +++ test/ELF/resolution.s @@ -308,7 +308,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _start -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global (0x1) // CHECK-NEXT: Type: None (0x0) Index: test/ELF/shared.s =================================================================== --- test/ELF/shared.s +++ test/ELF/shared.s @@ -144,7 +144,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _DYNAMIC -// CHECK-NEXT: Value: 0x12000 +// CHECK-NEXT: Value: 0x402000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -155,7 +155,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _start -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None @@ -194,7 +194,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _start@ -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Non Index: test/ELF/startstop-gccollect.s =================================================================== --- test/ELF/startstop-gccollect.s +++ test/ELF/startstop-gccollect.s @@ -12,13 +12,13 @@ # RUN: llvm-objdump -d %tout | FileCheck -check-prefix=DISASM %s # DISASM: _start: -# DISASM-NEXT: 11000: 90 nop +# DISASM-NEXT: 401000: 90 nop # DISASM-NEXT: Disassembly of section foo: # DISASM-NEXT: foo: -# DISASM-NEXT: 11001: 90 nop +# DISASM-NEXT: 401001: 90 nop # DISASM-NEXT: Disassembly of section bar: # DISASM-NEXT: bar: -# DISASM-NEXT: 11002: 90 nop +# DISASM-NEXT: 401002: 90 nop .global _start .text Index: test/ELF/startstop-shared2.s =================================================================== --- test/ELF/startstop-shared2.s +++ test/ELF/startstop-shared2.s @@ -8,7 +8,7 @@ // CHECK: foo 00000000 0000000000011008 // CHECK: Contents of section .text: -// CHECK-NEXT: 11000 08100100 00000000 +// CHECK-NEXT: 401000 08100100 00000000 .quad __start_foo .section foo,"ax" Index: test/ELF/string-gc.s =================================================================== --- test/ELF/string-gc.s +++ test/ELF/string-gc.s @@ -14,7 +14,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: s3 -// CHECK-NEXT: Value: 0x10125 +// CHECK-NEXT: Value: 0x400125 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local (0x0) // CHECK-NEXT: Type: Object (0x1) @@ -23,7 +23,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: s1 -// CHECK-NEXT: Value: 0x10120 +// CHECK-NEXT: Value: 0x400120 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local (0x0) // CHECK-NEXT: Type: Object (0x1) @@ -34,7 +34,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _start -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global (0x1) // CHECK-NEXT: Type: Function (0x2) Index: test/ELF/string-table.s =================================================================== --- test/ELF/string-table.s +++ test/ELF/string-table.s @@ -19,7 +19,7 @@ // CHECK-NEXT: Flags [ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x10120 +// CHECK-NEXT: Address: 0x400120 // CHECK: Name: foobar // CHECK-NEXT: Type: SHT_PROGBITS Index: test/ELF/symbol-ordering-file.s =================================================================== --- test/ELF/symbol-ordering-file.s +++ test/ELF/symbol-ordering-file.s @@ -4,7 +4,7 @@ # RUN: llvm-objdump -s %t.out| FileCheck %s --check-prefix=BEFORE # BEFORE: Contents of section .foo: -# BEFORE-NEXT: 11000 11223344 5566 +# BEFORE-NEXT: 401000 11223344 5566 # RUN: echo "_foo4 " > %t_order.txt # RUN: echo " _foo3" >> %t_order.txt @@ -19,7 +19,7 @@ # RUN: llvm-objdump -s %t2.out| FileCheck %s --check-prefix=AFTER # AFTER: Contents of section .foo: -# AFTER-NEXT: 11000 44335566 2211 +# AFTER-NEXT: 401000 44335566 2211 .section .foo,"ax",@progbits,unique,1 _foo1: Index: test/ELF/symbol-override.s =================================================================== --- test/ELF/symbol-override.s +++ test/ELF/symbol-override.s @@ -25,7 +25,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: foo -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Function Index: test/ELF/symbols.s =================================================================== --- test/ELF/symbols.s +++ test/ELF/symbols.s @@ -50,7 +50,7 @@ // CHECK-NEXT: Flags [ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x10158 +// CHECK-NEXT: Address: 0x400158 // CHECK: Name: .text // CHECK-NEXT: Type: SHT_PROGBITS @@ -66,7 +66,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x12000 +// CHECK-NEXT: Address: 0x402000 // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 4 @@ -82,7 +82,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: hidden -// CHECK-NEXT: Value: 0x10160 +// CHECK-NEXT: Value: 0x400160 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -93,7 +93,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: internal -// CHECK-NEXT: Value: 0x10160 +// CHECK-NEXT: Value: 0x400160 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Local // CHECK-NEXT: Type: None @@ -104,7 +104,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: _start -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global (0x1) // CHECK-NEXT: Type: Function @@ -131,7 +131,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: common -// CHECK-NEXT: Value: 0x12000 +// CHECK-NEXT: Value: 0x402000 // CHECK-NEXT: Size: 4 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Object @@ -140,7 +140,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: foo -// CHECK-NEXT: Value: 0x11000 +// CHECK-NEXT: Value: 0x401000 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Weak (0x2) // CHECK-NEXT: Type: Object @@ -149,7 +149,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: protected -// CHECK-NEXT: Value: 0x10160 +// CHECK-NEXT: Value: 0x400160 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None @@ -160,7 +160,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: zed -// CHECK-NEXT: Value: 0x10158 +// CHECK-NEXT: Value: 0x400158 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global (0x1) // CHECK-NEXT: Type: None @@ -169,7 +169,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: zed2 -// CHECK-NEXT: Value: 0x1015C +// CHECK-NEXT: Value: 0x40015C // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None @@ -178,7 +178,7 @@ // CHECK-NEXT: } // CHECK-NEXT: Symbol { // CHECK-NEXT: Name: zed3 -// CHECK-NEXT: Value: 0x10160 +// CHECK-NEXT: Value: 0x400160 // CHECK-NEXT: Size: 4 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: None Index: test/ELF/tls-got.s =================================================================== --- test/ELF/tls-got.s +++ test/ELF/tls-got.s @@ -24,23 +24,23 @@ // CHECK: Relocations [ // CHECK-NEXT: Section (4) .rela.dyn { -// CHECK-NEXT: 0x120B8 R_X86_64_TPOFF64 tls0 0x0 +// CHECK-NEXT: 0x4020B8 R_X86_64_TPOFF64 tls0 0x0 // CHECK-NEXT: [[ADDR]] R_X86_64_TPOFF64 tls1 0x0 // CHECK-NEXT: } // CHECK-NEXT: ] -//0x11000 + 4249 + 7 = 0x120B0 -//0x1100A + 4247 + 7 = 0x120B8 -//0x11014 + 4237 + 7 = 0x120B8 +//0x401000 + 4249 + 7 = 0x4020B0 +//0x40100A + 4247 + 7 = 0x4020B8 +//0x401014 + 4237 + 7 = 0x4020B8 //DISASM: Disassembly of section .text: //DISASM-NEXT: main: -//DISASM-NEXT: 11000: 48 8b 05 a9 10 00 00 movq 4265(%rip), %rax -//DISASM-NEXT: 11007: 64 8b 00 movl %fs:(%rax), %eax -//DISASM-NEXT: 1100a: 48 8b 05 a7 10 00 00 movq 4263(%rip), %rax -//DISASM-NEXT: 11011: 64 8b 00 movl %fs:(%rax), %eax -//DISASM-NEXT: 11014: 48 8b 05 9d 10 00 00 movq 4253(%rip), %rax -//DISASM-NEXT: 1101b: 64 8b 00 movl %fs:(%rax), %eax -//DISASM-NEXT: 1101e: c3 retq +//DISASM-NEXT: 401000: 48 8b 05 a9 10 00 00 movq 4265(%rip), %rax +//DISASM-NEXT: 401007: 64 8b 00 movl %fs:(%rax), %eax +//DISASM-NEXT: 40100a: 48 8b 05 a7 10 00 00 movq 4263(%rip), %rax +//DISASM-NEXT: 401011: 64 8b 00 movl %fs:(%rax), %eax +//DISASM-NEXT: 401014: 48 8b 05 9d 10 00 00 movq 4253(%rip), %rax +//DISASM-NEXT: 40101b: 64 8b 00 movl %fs:(%rax), %eax +//DISASM-NEXT: 40101e: c3 retq .section .tdata,"awT",@progbits Index: test/ELF/tls-i686.s =================================================================== --- test/ELF/tls-i686.s +++ test/ELF/tls-i686.s @@ -32,16 +32,16 @@ // DIS: Disassembly of section test: // DIS-NEXT: _start: -// DIS-NEXT: 12000: ba 08 00 00 00 movl $8, %edx -// DIS-NEXT: 12005: 65 8b 0d 00 00 00 00 movl %gs:0, %ecx -// DIS-NEXT: 1200c: 29 d0 subl %edx, %eax -// DIS-NEXT: 1200e: ba 04 00 00 00 movl $4, %edx -// DIS-NEXT: 12013: 65 8b 0d 00 00 00 00 movl %gs:0, %ecx -// DIS-NEXT: 1201a: 29 d0 subl %edx, %eax -// DIS-NEXT: 1201c: 65 8b 0d 00 00 00 00 movl %gs:0, %ecx -// DIS-NEXT: 12023: 8d 81 f8 ff ff ff leal -8(%ecx), %eax -// DIS-NEXT: 12029: 65 8b 0d 00 00 00 00 movl %gs:0, %ecx -// DIS-NEXT: 12030: 8d 81 77 00 00 00 leal 119(%ecx), %eax +// DIS-NEXT: 402000: ba 08 00 00 00 movl $8, %edx +// DIS-NEXT: 402005: 65 8b 0d 00 00 00 00 movl %gs:0, %ecx +// DIS-NEXT: 40200c: 29 d0 subl %edx, %eax +// DIS-NEXT: 40200e: ba 04 00 00 00 movl $4, %edx +// DIS-NEXT: 402013: 65 8b 0d 00 00 00 00 movl %gs:0, %ecx +// DIS-NEXT: 40201a: 29 d0 subl %edx, %eax +// DIS-NEXT: 40201c: 65 8b 0d 00 00 00 00 movl %gs:0, %ecx +// DIS-NEXT: 402023: 8d 81 f8 ff ff ff leal -8(%ecx), %eax +// DIS-NEXT: 402029: 65 8b 0d 00 00 00 00 movl %gs:0, %ecx +// DIS-NEXT: 402030: 8d 81 77 00 00 00 leal 119(%ecx), %eax // RELOC: Relocations [ // RELOC-NEXT: ] Index: test/ELF/tls-offset.s =================================================================== --- test/ELF/tls-offset.s +++ test/ELF/tls-offset.s @@ -30,7 +30,7 @@ // CHECK-NEXT: SHF_TLS // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x12000 +// CHECK-NEXT: Address: 0x402000 // CHECK-NEXT: Offset: 0x2000 // CHECK-NEXT: Size: 4 @@ -41,7 +41,7 @@ // CHECK-NEXT: SHF_TLS // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x12010 +// CHECK-NEXT: Address: 0x402010 // CHECK-NEXT: Offset: 0x2004 // CHECK-NEXT: Size: 16 @@ -51,6 +51,6 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x12004 +// CHECK-NEXT: Address: 0x402004 // CHECK-NEXT: Offset: 0x2004 // CHECK-NEXT: Size: 4 Index: test/ELF/tls-opt-gdie.s =================================================================== --- test/ELF/tls-opt-gdie.s +++ test/ELF/tls-opt-gdie.s @@ -13,7 +13,7 @@ //RELOC-NEXT: SHF_ALLOC //RELOC-NEXT: SHF_WRITE //RELOC-NEXT: ] -//RELOC-NEXT: Address: 0x120B0 +//RELOC-NEXT: Address: 0x4020B0 //RELOC-NEXT: Offset: 0x20B0 //RELOC-NEXT: Size: 16 //RELOC-NEXT: Link: 0 @@ -23,19 +23,19 @@ //RELOC-NEXT: } //RELOC: Relocations [ //RELOC-NEXT: Section (4) .rela.dyn { -//RELOC-NEXT: 0x120B0 R_X86_64_TPOFF64 tlsshared0 0x0 -//RELOC-NEXT: 0x120B8 R_X86_64_TPOFF64 tlsshared1 0x0 +//RELOC-NEXT: 0x4020B0 R_X86_64_TPOFF64 tlsshared0 0x0 +//RELOC-NEXT: 0x4020B8 R_X86_64_TPOFF64 tlsshared1 0x0 //RELOC-NEXT: } //RELOC-NEXT: ] -//0x11009 + (4256 + 7) = 0x120B0 -//0x11019 + (4248 + 7) = 0x120B8 +//0x401009 + (4256 + 7) = 0x4020B0 +//0x401019 + (4248 + 7) = 0x4020B8 // DISASM: Disassembly of section .text: // DISASM-NEXT: _start: -// DISASM-NEXT: 11000: {{.*}} movq %fs:0, %rax -// DISASM-NEXT: 11009: {{.*}} addq 4256(%rip), %rax -// DISASM-NEXT: 11010: {{.*}} movq %fs:0, %rax -// DISASM-NEXT: 11019: {{.*}} addq 4248(%rip), %rax +// DISASM-NEXT: 401000: {{.*}} movq %fs:0, %rax +// DISASM-NEXT: 401009: {{.*}} addq 4256(%rip), %rax +// DISASM-NEXT: 401010: {{.*}} movq %fs:0, %rax +// DISASM-NEXT: 401019: {{.*}} addq 4248(%rip), %rax .section .text .globl _start Index: test/ELF/tls-opt-gdiele-i686.s =================================================================== --- test/ELF/tls-opt-gdiele-i686.s +++ test/ELF/tls-opt-gdiele-i686.s @@ -7,21 +7,21 @@ // NORELOC: Relocations [ // NORELOC-NEXT: Section ({{.*}}) .rel.dyn { -// NORELOC-NEXT: 0x12058 R_386_TLS_TPOFF tlsshared0 0x0 -// NORELOC-NEXT: 0x1205C R_386_TLS_TPOFF tlsshared1 0x0 +// NORELOC-NEXT: 0x402058 R_386_TLS_TPOFF tlsshared0 0x0 +// NORELOC-NEXT: 0x40205C R_386_TLS_TPOFF tlsshared1 0x0 // NORELOC-NEXT: } // NORELOC-NEXT: ] // DISASM: Disassembly of section .text: // DISASM-NEXT: _start: -// DISASM-NEXT: 11000: 65 a1 00 00 00 00 movl %gs:0, %eax -// DISASM-NEXT: 11006: 03 83 f8 ff ff ff addl -8(%ebx), %eax -// DISASM-NEXT: 1100c: 65 a1 00 00 00 00 movl %gs:0, %eax -// DISASM-NEXT: 11012: 03 83 fc ff ff ff addl -4(%ebx), %eax -// DISASM-NEXT: 11018: 65 a1 00 00 00 00 movl %gs:0, %eax -// DISASM-NEXT: 1101e: 81 e8 08 00 00 00 subl $8, %eax -// DISASM-NEXT: 11024: 65 a1 00 00 00 00 movl %gs:0, %eax -// DISASM-NEXT: 1102a: 81 e8 04 00 00 00 subl $4, %eax +// DISASM-NEXT: 401000: 65 a1 00 00 00 00 movl %gs:0, %eax +// DISASM-NEXT: 401006: 03 83 f8 ff ff ff addl -8(%ebx), %eax +// DISASM-NEXT: 40100c: 65 a1 00 00 00 00 movl %gs:0, %eax +// DISASM-NEXT: 401012: 03 83 fc ff ff ff addl -4(%ebx), %eax +// DISASM-NEXT: 401018: 65 a1 00 00 00 00 movl %gs:0, %eax +// DISASM-NEXT: 40101e: 81 e8 08 00 00 00 subl $8, %eax +// DISASM-NEXT: 401024: 65 a1 00 00 00 00 movl %gs:0, %eax +// DISASM-NEXT: 40102a: 81 e8 04 00 00 00 subl $4, %eax .type tlsexe1,@object .section .tbss,"awT",@nobits Index: test/ELF/tls-opt-i686.s =================================================================== --- test/ELF/tls-opt-i686.s +++ test/ELF/tls-opt-i686.s @@ -9,25 +9,25 @@ // DISASM: Disassembly of section .text: // DISASM-NEXT: _start: // LD -> LE: -// DISASM-NEXT: 11000: 65 a1 00 00 00 00 movl %gs:0, %eax -// DISASM-NEXT: 11006: 90 nop -// DISASM-NEXT: 11007: 8d 74 26 00 leal (%esi), %esi -// DISASM-NEXT: 1100b: 8d 90 f8 ff ff ff leal -8(%eax), %edx -// DISASM-NEXT: 11011: 65 a1 00 00 00 00 movl %gs:0, %eax -// DISASM-NEXT: 11017: 90 nop -// DISASM-NEXT: 11018: 8d 74 26 00 leal (%esi), %esi -// DISASM-NEXT: 1101c: 8d 90 fc ff ff ff leal -4(%eax), %edx +// DISASM-NEXT: 401000: 65 a1 00 00 00 00 movl %gs:0, %eax +// DISASM-NEXT: 401006: 90 nop +// DISASM-NEXT: 401007: 8d 74 26 00 leal (%esi), %esi +// DISASM-NEXT: 40100b: 8d 90 f8 ff ff ff leal -8(%eax), %edx +// DISASM-NEXT: 401011: 65 a1 00 00 00 00 movl %gs:0, %eax +// DISASM-NEXT: 401017: 90 nop +// DISASM-NEXT: 401018: 8d 74 26 00 leal (%esi), %esi +// DISASM-NEXT: 40101c: 8d 90 fc ff ff ff leal -4(%eax), %edx // IE -> LE: // 4294967288 == 0xFFFFFFF8 // 4294967292 == 0xFFFFFFFC -// DISASM-NEXT: 11022: 65 a1 00 00 00 00 movl %gs:0, %eax -// DISASM-NEXT: 11028: c7 c0 f8 ff ff ff movl $4294967288, %eax -// DISASM-NEXT: 1102e: 65 a1 00 00 00 00 movl %gs:0, %eax -// DISASM-NEXT: 11034: c7 c0 fc ff ff ff movl $4294967292, %eax -// DISASM-NEXT: 1103a: 65 a1 00 00 00 00 movl %gs:0, %eax -// DISASM-NEXT: 11040: 8d 80 f8 ff ff ff leal -8(%eax), %eax -// DISASM-NEXT: 11046: 65 a1 00 00 00 00 movl %gs:0, %eax -// DISASM-NEXT: 1104c: 8d 80 fc ff ff ff leal -4(%eax), %eax +// DISASM-NEXT: 401022: 65 a1 00 00 00 00 movl %gs:0, %eax +// DISASM-NEXT: 401028: c7 c0 f8 ff ff ff movl $4294967288, %eax +// DISASM-NEXT: 40102e: 65 a1 00 00 00 00 movl %gs:0, %eax +// DISASM-NEXT: 401034: c7 c0 fc ff ff ff movl $4294967292, %eax +// DISASM-NEXT: 40103a: 65 a1 00 00 00 00 movl %gs:0, %eax +// DISASM-NEXT: 401040: 8d 80 f8 ff ff ff leal -8(%eax), %eax +// DISASM-NEXT: 401046: 65 a1 00 00 00 00 movl %gs:0, %eax +// DISASM-NEXT: 40104c: 8d 80 fc ff ff ff leal -4(%eax), %eax .type tls0,@object .section .tbss,"awT",@nobits .globl tls0 Index: test/ELF/tls-opt-iele-i686-nopic.s =================================================================== --- test/ELF/tls-opt-iele-i686-nopic.s +++ test/ELF/tls-opt-iele-i686-nopic.s @@ -13,7 +13,7 @@ // GOTREL-NEXT: SHF_ALLOC // GOTREL-NEXT: SHF_WRITE // GOTREL-NEXT: ] -// GOTREL-NEXT: Address: 0x12058 +// GOTREL-NEXT: Address: 0x402058 // GOTREL-NEXT: Offset: 0x2058 // GOTREL-NEXT: Size: 8 // GOTREL-NEXT: Link: 0 @@ -23,8 +23,8 @@ // GOTREL-NEXT: } // GOTREL: Relocations [ // GOTREL-NEXT: Section ({{.*}}) .rel.dyn { -// GOTREL-NEXT: 0x12058 R_386_TLS_TPOFF tlsshared0 0x0 -// GOTREL-NEXT: 0x1205C R_386_TLS_TPOFF tlsshared1 0x0 +// GOTREL-NEXT: 0x402058 R_386_TLS_TPOFF tlsshared0 0x0 +// GOTREL-NEXT: 0x40205C R_386_TLS_TPOFF tlsshared1 0x0 // GOTREL-NEXT: } // GOTREL-NEXT: ] @@ -32,24 +32,24 @@ // DISASM-NEXT: _start: // 4294967288 = 0xFFFFFFF8 // 4294967292 = 0xFFFFFFFC -// 73808 = (.got)[0] = 0x12058 -// 73812 = (.got)[1] = 0x1205C -// DISASM-NEXT: 11000: c7 c1 f8 ff ff ff movl $4294967288, %ecx -// DISASM-NEXT: 11006: 65 8b 01 movl %gs:(%ecx), %eax -// DISASM-NEXT: 11009: b8 f8 ff ff ff movl $4294967288, %eax -// DISASM-NEXT: 1100e: 65 8b 00 movl %gs:(%eax), %eax -// DISASM-NEXT: 11011: 81 c1 f8 ff ff ff addl $4294967288, %ecx -// DISASM-NEXT: 11017: 65 8b 01 movl %gs:(%ecx), %eax -// DISASM-NEXT: 1101a: c7 c1 fc ff ff ff movl $4294967292, %ecx -// DISASM-NEXT: 11020: 65 8b 01 movl %gs:(%ecx), %eax -// DISASM-NEXT: 11023: b8 fc ff ff ff movl $4294967292, %eax -// DISASM-NEXT: 11028: 65 8b 00 movl %gs:(%eax), %eax -// DISASM-NEXT: 1102b: 81 c1 fc ff ff ff addl $4294967292, %ecx -// DISASM-NEXT: 11031: 65 8b 01 movl %gs:(%ecx), %eax -// DISASM-NEXT: 11034: 8b 0d 58 20 01 00 movl 73816, %ecx -// DISASM-NEXT: 1103a: 65 8b 01 movl %gs:(%ecx), %eax -// DISASM-NEXT: 1103d: 03 0d 5c 20 01 00 addl 73820, %ecx -// DISASM-NEXT: 11043: 65 8b 01 movl %gs:(%ecx), %eax +// 73808 = (.got)[0] = 0x402058 +// 73812 = (.got)[1] = 0x40205C +// DISASM-NEXT: 401000: c7 c1 f8 ff ff ff movl $4294967288, %ecx +// DISASM-NEXT: 401006: 65 8b 01 movl %gs:(%ecx), %eax +// DISASM-NEXT: 401009: b8 f8 ff ff ff movl $4294967288, %eax +// DISASM-NEXT: 40100e: 65 8b 00 movl %gs:(%eax), %eax +// DISASM-NEXT: 401011: 81 c1 f8 ff ff ff addl $4294967288, %ecx +// DISASM-NEXT: 401017: 65 8b 01 movl %gs:(%ecx), %eax +// DISASM-NEXT: 40101a: c7 c1 fc ff ff ff movl $4294967292, %ecx +// DISASM-NEXT: 401020: 65 8b 01 movl %gs:(%ecx), %eax +// DISASM-NEXT: 401023: b8 fc ff ff ff movl $4294967292, %eax +// DISASM-NEXT: 401028: 65 8b 00 movl %gs:(%eax), %eax +// DISASM-NEXT: 40102b: 81 c1 fc ff ff ff addl $4294967292, %ecx +// DISASM-NEXT: 401031: 65 8b 01 movl %gs:(%ecx), %eax +// DISASM-NEXT: 401034: 8b 0d 58 20 01 00 movl 73816, %ecx +// DISASM-NEXT: 40103a: 65 8b 01 movl %gs:(%ecx), %eax +// DISASM-NEXT: 40103d: 03 0d 5c 20 01 00 addl 73820, %ecx +// DISASM-NEXT: 401043: 65 8b 01 movl %gs:(%ecx), %eax .type tlslocal0,@object .section .tbss,"awT",@nobits Index: test/ELF/tls-opt-local.s =================================================================== --- test/ELF/tls-opt-local.s +++ test/ELF/tls-opt-local.s @@ -8,18 +8,18 @@ // DISASM: Disassembly of section .text: // DISASM-NEXT: _start: -// DISASM-NEXT: 11000: 48 c7 c0 f8 ff ff ff movq $-8, %rax -// DISASM-NEXT: 11007: 49 c7 c7 f8 ff ff ff movq $-8, %r15 -// DISASM-NEXT: 1100e: 48 8d 80 f8 ff ff ff leaq -8(%rax), %rax -// DISASM-NEXT: 11015: 4d 8d bf f8 ff ff ff leaq -8(%r15), %r15 -// DISASM-NEXT: 1101c: 48 81 c4 f8 ff ff ff addq $-8, %rsp -// DISASM-NEXT: 11023: 49 81 c4 f8 ff ff ff addq $-8, %r12 -// DISASM-NEXT: 1102a: 48 c7 c0 fc ff ff ff movq $-4, %rax -// DISASM-NEXT: 11031: 49 c7 c7 fc ff ff ff movq $-4, %r15 -// DISASM-NEXT: 11038: 48 8d 80 fc ff ff ff leaq -4(%rax), %rax -// DISASM-NEXT: 1103f: 4d 8d bf fc ff ff ff leaq -4(%r15), %r15 -// DISASM-NEXT: 11046: 48 81 c4 fc ff ff ff addq $-4, %rsp -// DISASM-NEXT: 1104d: 49 81 c4 fc ff ff ff addq $-4, %r12 +// DISASM-NEXT: 401000: 48 c7 c0 f8 ff ff ff movq $-8, %rax +// DISASM-NEXT: 401007: 49 c7 c7 f8 ff ff ff movq $-8, %r15 +// DISASM-NEXT: 40100e: 48 8d 80 f8 ff ff ff leaq -8(%rax), %rax +// DISASM-NEXT: 401015: 4d 8d bf f8 ff ff ff leaq -8(%r15), %r15 +// DISASM-NEXT: 40101c: 48 81 c4 f8 ff ff ff addq $-8, %rsp +// DISASM-NEXT: 401023: 49 81 c4 f8 ff ff ff addq $-8, %r12 +// DISASM-NEXT: 40102a: 48 c7 c0 fc ff ff ff movq $-4, %rax +// DISASM-NEXT: 401031: 49 c7 c7 fc ff ff ff movq $-4, %r15 +// DISASM-NEXT: 401038: 48 8d 80 fc ff ff ff leaq -4(%rax), %rax +// DISASM-NEXT: 40103f: 4d 8d bf fc ff ff ff leaq -4(%r15), %r15 +// DISASM-NEXT: 401046: 48 81 c4 fc ff ff ff addq $-4, %rsp +// DISASM-NEXT: 40104d: 49 81 c4 fc ff ff ff addq $-4, %r12 .section .tbss,"awT",@nobits Index: test/ELF/tls-opt.s =================================================================== --- test/ELF/tls-opt.s +++ test/ELF/tls-opt.s @@ -7,36 +7,36 @@ // NORELOC-NEXT: ] // DISASM: _start: -// DISASM-NEXT: 11000: 48 c7 c0 f8 ff ff ff movq $-8, %rax -// DISASM-NEXT: 11007: 49 c7 c7 f8 ff ff ff movq $-8, %r15 -// DISASM-NEXT: 1100e: 48 8d 80 f8 ff ff ff leaq -8(%rax), %rax -// DISASM-NEXT: 11015: 4d 8d bf f8 ff ff ff leaq -8(%r15), %r15 -// DISASM-NEXT: 1101c: 48 81 c4 f8 ff ff ff addq $-8, %rsp -// DISASM-NEXT: 11023: 49 81 c4 f8 ff ff ff addq $-8, %r12 -// DISASM-NEXT: 1102a: 48 c7 c0 fc ff ff ff movq $-4, %rax -// DISASM-NEXT: 11031: 49 c7 c7 fc ff ff ff movq $-4, %r15 -// DISASM-NEXT: 11038: 48 8d 80 fc ff ff ff leaq -4(%rax), %rax -// DISASM-NEXT: 1103f: 4d 8d bf fc ff ff ff leaq -4(%r15), %r15 -// DISASM-NEXT: 11046: 48 81 c4 fc ff ff ff addq $-4, %rsp -// DISASM-NEXT: 1104d: 49 81 c4 fc ff ff ff addq $-4, %r12 +// DISASM-NEXT: 401000: 48 c7 c0 f8 ff ff ff movq $-8, %rax +// DISASM-NEXT: 401007: 49 c7 c7 f8 ff ff ff movq $-8, %r15 +// DISASM-NEXT: 40100e: 48 8d 80 f8 ff ff ff leaq -8(%rax), %rax +// DISASM-NEXT: 401015: 4d 8d bf f8 ff ff ff leaq -8(%r15), %r15 +// DISASM-NEXT: 40101c: 48 81 c4 f8 ff ff ff addq $-8, %rsp +// DISASM-NEXT: 401023: 49 81 c4 f8 ff ff ff addq $-8, %r12 +// DISASM-NEXT: 40102a: 48 c7 c0 fc ff ff ff movq $-4, %rax +// DISASM-NEXT: 401031: 49 c7 c7 fc ff ff ff movq $-4, %r15 +// DISASM-NEXT: 401038: 48 8d 80 fc ff ff ff leaq -4(%rax), %rax +// DISASM-NEXT: 40103f: 4d 8d bf fc ff ff ff leaq -4(%r15), %r15 +// DISASM-NEXT: 401046: 48 81 c4 fc ff ff ff addq $-4, %rsp +// DISASM-NEXT: 40104d: 49 81 c4 fc ff ff ff addq $-4, %r12 // LD to LE: -// DISASM-NEXT: 11054: 66 66 66 64 48 8b 04 25 00 00 00 00 movq %fs:0, %rax -// DISASM-NEXT: 11060: 48 8d 88 f8 ff ff ff leaq -8(%rax), %rcx -// DISASM-NEXT: 11067: 66 66 66 64 48 8b 04 25 00 00 00 00 movq %fs:0, %rax -// DISASM-NEXT: 11073: 48 8d 88 fc ff ff ff leaq -4(%rax), %rcx +// DISASM-NEXT: 401054: 66 66 66 64 48 8b 04 25 00 00 00 00 movq %fs:0, %rax +// DISASM-NEXT: 401060: 48 8d 88 f8 ff ff ff leaq -8(%rax), %rcx +// DISASM-NEXT: 401067: 66 66 66 64 48 8b 04 25 00 00 00 00 movq %fs:0, %rax +// DISASM-NEXT: 401073: 48 8d 88 fc ff ff ff leaq -4(%rax), %rcx // GD to LE: -// DISASM-NEXT: 1107a: 64 48 8b 04 25 00 00 00 00 movq %fs:0, %rax -// DISASM-NEXT: 11083: 48 8d 80 f8 ff ff ff leaq -8(%rax), %rax -// DISASM-NEXT: 1108a: 64 48 8b 04 25 00 00 00 00 movq %fs:0, %rax -// DISASM-NEXT: 11093: 48 8d 80 fc ff ff ff leaq -4(%rax), %rax +// DISASM-NEXT: 40107a: 64 48 8b 04 25 00 00 00 00 movq %fs:0, %rax +// DISASM-NEXT: 401083: 48 8d 80 f8 ff ff ff leaq -8(%rax), %rax +// DISASM-NEXT: 40108a: 64 48 8b 04 25 00 00 00 00 movq %fs:0, %rax +// DISASM-NEXT: 401093: 48 8d 80 fc ff ff ff leaq -4(%rax), %rax // LD to LE: // DISASM: _DTPOFF64_1: -// DISASM-NEXT: 1109a: f8 clc +// DISASM-NEXT: 40109a: f8 clc // DISASM: _DTPOFF64_2: -// DISASM-NEXT: 110a3: fc cld +// DISASM-NEXT: 4010a3: fc cld .type tls0,@object .section .tbss,"awT",@nobits Index: test/ELF/tls.s =================================================================== --- test/ELF/tls.s +++ test/ELF/tls.s @@ -90,9 +90,9 @@ // CHECK-NEXT: SHF_WRITE // CHECK-NEXT: ] -// 0x1200C = TBSS_ADDR + 4 +// 0x40200C = TBSS_ADDR + 4 -// CHECK-NEXT: Address: 0x1200C +// CHECK-NEXT: Address: 0x40200C // CHECK-NEXT: Offset: // CHECK-NEXT: Size: 4 // CHECK-NEXT: Link: @@ -164,7 +164,7 @@ // DIS: Disassembly of section .text: // DIS-NEXT: _start: -// DIS-NEXT: 11000: {{.+}} movl %fs:-8, %eax -// DIS-NEXT: 11008: {{.+}} movl %fs:-16, %eax -// DIS-NEXT: 11010: {{.+}} movl %fs:-4, %eax -// DIS-NEXT: 11018: {{.+}} movl %fs:-12, %eax +// DIS-NEXT: 401000: {{.+}} movl %fs:-8, %eax +// DIS-NEXT: 401008: {{.+}} movl %fs:-16, %eax +// DIS-NEXT: 401010: {{.+}} movl %fs:-4, %eax +// DIS-NEXT: 401018: {{.+}} movl %fs:-12, %eax Index: test/ELF/undef-with-plt-addr-i686.s =================================================================== --- test/ELF/undef-with-plt-addr-i686.s +++ test/ELF/undef-with-plt-addr-i686.s @@ -17,7 +17,7 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_EXECINSTR // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x11010 +// CHECK-NEXT: Address: 0x401010 // CHECK: Name: set_data -// CHECK-NEXT: Value: 0x11020 +// CHECK-NEXT: Value: 0x401020 Index: test/ELF/undef-with-plt-addr.s =================================================================== --- test/ELF/undef-with-plt-addr.s +++ test/ELF/undef-with-plt-addr.s @@ -19,13 +19,13 @@ // CHECK-NEXT: SHF_ALLOC // CHECK-NEXT: SHF_EXECINSTR // CHECK-NEXT: ] -// CHECK-NEXT: Address: 0x11010 +// CHECK-NEXT: Address: 0x401010 // CHECK: Section ({{.*}}) .rela.dyn { -// CHECK-NEXT: 0x13000 R_X86_64_64 foo 0x0 +// CHECK-NEXT: 0x403000 R_X86_64_64 foo 0x0 // CHECK-NEXT: } // CHECK-NEXT: Section ({{.*}}) .rela.plt { -// CHECK-NEXT: 0x13020 R_X86_64_JUMP_SLOT set_data 0x0 +// CHECK-NEXT: 0x403020 R_X86_64_JUMP_SLOT set_data 0x0 // CHECK-NEXT: } // CHECK: Name: foo @@ -37,7 +37,7 @@ // CHECK-NEXT: Section: Undefined // CHECK: Name: set_data -// CHECK-NEXT: Value: 0x11020 +// CHECK-NEXT: Value: 0x401020 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Global // CHECK-NEXT: Type: Function Index: test/ELF/verdef-defaultver.s =================================================================== --- test/ELF/verdef-defaultver.s +++ test/ELF/verdef-defaultver.s @@ -122,7 +122,7 @@ # EXE-NEXT: } # EXE-NEXT: Symbol { # EXE-NEXT: Name: a@V1 -# EXE-NEXT: Value: 0x11020 +# EXE-NEXT: Value: 0x401020 # EXE-NEXT: Size: 0 # EXE-NEXT: Binding: Global # EXE-NEXT: Type: Function @@ -131,7 +131,7 @@ # EXE-NEXT: } # EXE-NEXT: Symbol { # EXE-NEXT: Name: b@V2 -# EXE-NEXT: Value: 0x11030 +# EXE-NEXT: Value: 0x401030 # EXE-NEXT: Size: 0 # EXE-NEXT: Binding: Global # EXE-NEXT: Type: Function @@ -140,7 +140,7 @@ # EXE-NEXT: } # EXE-NEXT: Symbol { # EXE-NEXT: Name: c@V2 -# EXE-NEXT: Value: 0x11040 +# EXE-NEXT: Value: 0x401040 # EXE-NEXT: Size: 0 # EXE-NEXT: Binding: Global # EXE-NEXT: Type: Function @@ -150,7 +150,7 @@ # EXE-NEXT: ] # EXE-NEXT: Version symbols { # EXE-NEXT: Section Name: .gnu.version -# EXE-NEXT: Address: 0x10228 +# EXE-NEXT: Address: 0x400228 # EXE-NEXT: Offset: 0x228 # EXE-NEXT: Link: 1 # EXE-NEXT: Symbols [ Index: test/ELF/verdef.s =================================================================== --- test/ELF/verdef.s +++ test/ELF/verdef.s @@ -70,7 +70,7 @@ # MAIN: Version symbols { # MAIN-NEXT: Section Name: .gnu.version -# MAIN-NEXT: Address: 0x10228 +# MAIN-NEXT: Address: 0x400228 # MAIN-NEXT: Offset: 0x228 # MAIN-NEXT: Link: 1 # MAIN-NEXT: Symbols [ Index: test/ELF/verneed.s =================================================================== --- test/ELF/verneed.s +++ test/ELF/verneed.s @@ -10,7 +10,7 @@ # CHECK-NEXT: Flags [ (0x2) # CHECK-NEXT: SHF_ALLOC (0x2) # CHECK-NEXT: ] -# CHECK-NEXT: Address: 0x101C8 +# CHECK-NEXT: Address: 0x4001C8 # CHECK-NEXT: Offset: 0x1C8 # CHECK-NEXT: Size: 96 # CHECK-NEXT: Link: 5 @@ -24,7 +24,7 @@ # CHECK-NEXT: Flags [ (0x2) # CHECK-NEXT: SHF_ALLOC (0x2) # CHECK-NEXT: ] -# CHECK-NEXT: Address: 0x10228 +# CHECK-NEXT: Address: 0x400228 # CHECK-NEXT: Offset: 0x228 # CHECK-NEXT: Size: 8 # CHECK-NEXT: Link: 1 @@ -38,7 +38,7 @@ # CHECK-NEXT: Flags [ (0x2) # CHECK-NEXT: SHF_ALLOC (0x2) # CHECK-NEXT: ] -# CHECK-NEXT: Address: 0x10230 +# CHECK-NEXT: Address: 0x400230 # CHECK-NEXT: Offset: 0x230 # CHECK-NEXT: Size: 80 # CHECK-NEXT: Link: 5 @@ -52,7 +52,7 @@ # CHECK-NEXT: Flags [ (0x2) # CHECK-NEXT: SHF_ALLOC (0x2) # CHECK-NEXT: ] -# CHECK-NEXT: Address: 0x102A8 +# CHECK-NEXT: Address: 0x4002A8 # CHECK-NEXT: Offset: 0x2A8 # CHECK-NEXT: Size: 47 # CHECK-NEXT: Link: 0 @@ -105,13 +105,13 @@ # CHECK-NEXT: } # CHECK-NEXT: ] -# CHECK: 0x000000006FFFFFF0 VERSYM 0x10228 -# CHECK-NEXT: 0x000000006FFFFFFE VERNEED 0x10230 +# CHECK: 0x000000006FFFFFF0 VERSYM 0x400228 +# CHECK-NEXT: 0x000000006FFFFFFE VERNEED 0x400230 # CHECK-NEXT: 0x000000006FFFFFFF VERNEEDNUM 2 # CHECK: Version symbols { # CHECK-NEXT: Section Name: .gnu.version -# CHECK-NEXT: Address: 0x10228 +# CHECK-NEXT: Address: 0x400228 # CHECK-NEXT: Offset: 0x228 # CHECK-NEXT: Link: 1 # CHECK-NEXT: Symbols [ Index: test/ELF/version-script.s =================================================================== --- test/ELF/version-script.s +++ test/ELF/version-script.s @@ -126,7 +126,7 @@ # EXE-NEXT: } # EXE-NEXT: Symbol { # EXE-NEXT: Name: foo1@ -# EXE-NEXT: Value: 0x11000 +# EXE-NEXT: Value: 0x401000 # EXE-NEXT: Size: 0 # EXE-NEXT: Binding: Global (0x1) # EXE-NEXT: Type: None (0x0) Index: test/ELF/weak-undef-shared.s =================================================================== --- test/ELF/weak-undef-shared.s +++ test/ELF/weak-undef-shared.s @@ -6,7 +6,7 @@ // RUN: llvm-readobj -t %t.exe | FileCheck %s // CHECK: Name: bar -// CHECK-NEXT: Value: 0x11020 +// CHECK-NEXT: Value: 0x401020 // CHECK-NEXT: Size: 0 // CHECK-NEXT: Binding: Weak // CHECK-NEXT: Type: Function Index: test/ELF/wrap.s =================================================================== --- test/ELF/wrap.s +++ test/ELF/wrap.s @@ -8,9 +8,9 @@ // RUN: llvm-objdump -d -print-imm-hex %t3 | FileCheck %s // CHECK: _start: -// CHECK-NEXT: movl $0x11010, %edx -// CHECK-NEXT: movl $0x11010, %edx -// CHECK-NEXT: movl $0x11000, %edx +// CHECK-NEXT: movl $0x401010, %edx +// CHECK-NEXT: movl $0x401010, %edx +// CHECK-NEXT: movl $0x401000, %edx .global _start _start: Index: test/ELF/x86-64-tls-pie.s =================================================================== --- test/ELF/x86-64-tls-pie.s +++ test/ELF/x86-64-tls-pie.s @@ -3,7 +3,7 @@ # RUN: ld.lld -pie %t1.o -o %t # RUN: llvm-readobj -r %t | FileCheck %s -# Bug 27174: R_X86_64_TPOFF32 and R_X86_64_GOTTPOFF relocations should +# Bug 407174: R_X86_64_TPOFF32 and R_X86_64_GOTTPOFF relocations should # be eliminated when building a PIE executable, as the static TLS layout # is fixed. #