lld: Default image base address to 0x200000 on x86-64

[emaste]

Summary

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.

Test updates are incomplete. I started with a sed replacement to update some of them, and am iterating through the remaining failures. Some tests need more investigation e.g. ELF/aarch64-prel32.s is producing a relocation out of range error.

Assuming there are no objections to this change in principle I will continue with the test updates.

[emaste]

Incorporate feedback from Rafael:

• Use 2MB instead of 4MB
• Apply only to x86-64 for now

[emaste]

test/ELF/gnu-ifunc-i386.s

99–100 ↗

(On Diff #79070)

Shall I change these cases to {{.*}} first?

[emaste]

Oops, I applied the change to x86, not x86-64. Will add new patch shortly.

[• rafael]

ELF/Target.cpp

317 ↗

(On Diff #79070)

Do update the comment on the .h file too :-)

This is updating i386, not x86_64.

[emaste]

Apply to x86-64

[emaste]

ELF/Target.h

71–72 ↗

(On Diff #79081)

The minimum is still 0x10000 so leaving the rest of the comment intact makes sense to me.

test/ELF/build-id.s

47 ↗

(On Diff #79081)

I'm not sure why these were checking only the first byte of the build-id - I can change back to doing that if desired

test/ELF/eh-frame-hdr-icf.s

9 ↗

(On Diff #79081)

need to update whitespace

11 ↗

(On Diff #79081)

and here

test/ELF/eh-frame-hdr.s

67–77 ↗

(On Diff #79081)

Addresses in these comments need to be checked/updated

test/ELF/gnu-ifunc.s

98–100 ↗

(On Diff #79081)

should I switch these to {{.*}} in a first commit?

test/ELF/gotpc-relax-nopic.s

18–26 ↗

(On Diff #79081)

Should I switch these to {{.*}}

test/ELF/merge.s

38–39 ↗

(On Diff #79081)

Comments need to be updated

test/ELF/no-inhibit-exec.s

9 ↗

(On Diff #79081)

{{.*}} ?

test/ELF/relocation-copy.s

62–67 ↗

(On Diff #79081)

{{.*}} ?

test/ELF/relocation-local.s

27 ↗

(On Diff #79081)

Change this to maintain a negative offset?

[• rafael]

LGTM

test/ELF/eh-frame-hdr.s

67 ↗

(On Diff #79081)

It is a pity "llvm-objdump -dwarf=frames" is broken :-(

test/ELF/gotpc-relax-nopic.s

18–26 ↗

(On Diff #79081)

Yes please.

test/ELF/no-inhibit-exec.s

9 ↗

(On Diff #79081)

Yes

test/ELF/relocation-copy.s

62–67 ↗

(On Diff #79081)

Yes.

[ruiu]

LGTM

ELF/Target.h

67–68 ↗

(On Diff #79081)

nit: freebsd -> Freebsd, linux -> Linux

[emaste]

test/ELF/gotpc-relax-nopic.s

15 ↗

(On Diff #79081)

Another comment to update

test/ELF/relocation-local.s

27 ↗

(On Diff #79081)

This was originally introduced in D12978 / rL248196 and I don't see a reason it must be negative.

[emaste]

• Rebase after rL287778 {{.*}}
• Incorporate review feedback and update a few missed address comments

lld/trunk/ELF/Target.h

public:
   virtual RelExpr getRelExpr(uint32_t Type, const SymbolBody &S) const = 0;
   virtual void relocateOne(uint8_t *Loc, uint32_t Type, uint64_t Val) const = 0;
   virtual ~TargetInfo();
 
   unsigned TlsGdRelaxSkip = 1;
   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
+  // 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;
 
   uint32_t CopyRel;
   uint32_t GotRel;
   uint32_t PltRel;
   uint32_t RelativeRel;
   uint32_t IRelativeRel;
   uint32_t TlsDescRel;

lld/trunk/ELF/Target.cpp

template <class ELFT> X86_64TargetInfo<ELFT>::X86_64TargetInfo() {
   TlsGotRel = R_X86_64_TPOFF64;
   TlsModuleIndexRel = R_X86_64_DTPMOD64;
   TlsOffsetRel = R_X86_64_DTPOFF64;
   GotEntrySize = 8;
   GotPltEntrySize = 8;
   PltEntrySize = 16;
   PltHeaderSize = 16;
   TlsGdRelaxSkip = 2;
+  // Align to the large page size (known as a superpage or huge page).
+  // FreeBSD automatically promotes large, superpage-aligned allocations.
+  DefaultImageBase = 0x200000;                                         
 }
 
 template <class ELFT>
 RelExpr X86_64TargetInfo<ELFT>::getRelExpr(uint32_t Type,
                                            const SymbolBody &S) const {
   switch (Type) {
   default:
     return R_ABS;

lld/trunk/test/ELF/allow-multiple-definition.s

 
 # inputs contain different constants for instuction movl.
 # Tests below checks that order of files in command line
 # affects on what symbol will be used.
 # If flag allow-multiple-definition is enabled the first
 # meet symbol should be used.
 
 # CHECK: _bar:
-# CHECK-NEXT: 11000:   b8 01 00 00 00   movl   $1, %eax
+# CHECK-NEXT: 201000:   b8 01 00 00 00   movl   $1, %eax
 
 # REVERT: _bar:
-# REVERT-NEXT: 11000:   b8 02 00 00 00   movl   $2, %eax
+# REVERT-NEXT: 201000:   b8 02 00 00 00   movl   $2, %eax
 
 .globl _bar
 .type _bar, @function
 _bar:
   mov $1, %eax
 
 .globl _start
 _start:

lld/trunk/test/ELF/avoid-empty-program-headers.s

.section .tbss,"awT",@nobits
         .zero 4
 // FIXME: Test that we don't create unecessary empty PT_LOAD and PT_GNU_RELRO
 // for the .tbss section.
 
 // CHECK:      ProgramHeaders [
 // CHECK-NEXT:   ProgramHeader {
 // CHECK-NEXT:     Type: PT_PHDR (0x6)
 // CHECK-NEXT:     Offset: 0x40
-// CHECK-NEXT:     VirtualAddress: 0x10040
-// CHECK-NEXT:     PhysicalAddress: 0x10040
+// CHECK-NEXT:     VirtualAddress: 0x200040
+// CHECK-NEXT:     PhysicalAddress: 0x200040
 // CHECK-NEXT:     FileSize: 280
 // CHECK-NEXT:     MemSize: 280
 // CHECK-NEXT:     Flags [ (0x4)
 // CHECK-NEXT:       PF_R (0x4)
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Alignment: 8
 // CHECK-NEXT:   }
 // CHECK-NEXT:   ProgramHeader {
 // CHECK-NEXT:     Type: PT_LOAD (0x1)
 // CHECK-NEXT:     Offset: 0x0
-// CHECK-NEXT:     VirtualAddress: 0x10000
-// CHECK-NEXT:     PhysicalAddress: 0x10000
+// CHECK-NEXT:     VirtualAddress: 0x200000
+// CHECK-NEXT:     PhysicalAddress: 0x200000
 // CHECK-NEXT:     FileSize: 344
 // CHECK-NEXT:     MemSize: 344
 // CHECK-NEXT:     Flags [ (0x4)
 // CHECK-NEXT:       PF_R (0x4)
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Alignment: 4096
 // CHECK-NEXT:   }
 // CHECK-NEXT:   ProgramHeader {
 // CHECK-NEXT:     Type: PT_LOAD (0x1)
 // CHECK-NEXT:     Offset: 0x1000
-// CHECK-NEXT:     VirtualAddress: 0x11000
-// CHECK-NEXT:     PhysicalAddress: 0x11000
+// CHECK-NEXT:     VirtualAddress: 0x201000
+// CHECK-NEXT:     PhysicalAddress: 0x201000
 // CHECK-NEXT:     FileSize: 1
 // CHECK-NEXT:     MemSize: 1
 // CHECK-NEXT:     Flags [ (0x5)
 // CHECK-NEXT:       PF_R (0x4)
 // CHECK-NEXT:       PF_X (0x1)
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Alignment: 4096
 // CHECK-NEXT:   }
 // CHECK-NEXT:   ProgramHeader {
 // CHECK-NEXT:     Type: PT_TLS (0x7)
 // CHECK-NEXT:     Offset: 0x1001
-// CHECK-NEXT:     VirtualAddress: 0x11001
-// CHECK-NEXT:     PhysicalAddress: 0x11001
+// CHECK-NEXT:     VirtualAddress: 0x201001
+// CHECK-NEXT:     PhysicalAddress: 0x201001
 // CHECK-NEXT:     FileSize: 0
 // CHECK-NEXT:     MemSize: 4
 // CHECK-NEXT:     Flags [ (0x4)
 // CHECK-NEXT:       PF_R (0x4)
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Alignment: 1
 // CHECK-NEXT:   }
 // CHECK-NEXT:   ProgramHeader {

lld/trunk/test/ELF/basic.s

 # CHECK-NEXT:   Section {
 # CHECK-NEXT:     Index: 1
 # CHECK-NEXT:     Name: .text
 # CHECK-NEXT:     Type: SHT_PROGBITS (0x1)
 # CHECK-NEXT:     Flags [ (0x6)
 # CHECK-NEXT:       SHF_ALLOC (0x2)
 # CHECK-NEXT:       SHF_EXECINSTR (0x4)
 # CHECK-NEXT:     ]
-# CHECK-NEXT:     Address: 0x11000
+# CHECK-NEXT:     Address: 0x201000
 # CHECK-NEXT:     Offset: 0x1000
 # CHECK-NEXT:     Size: 16
 # CHECK-NEXT:     Link: 0
 # CHECK-NEXT:     Info: 0
 # CHECK-NEXT:     AddressAlignment: 4
 # CHECK-NEXT:     EntrySize: 0
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Section {

 # CHECK-NEXT:     Other: 0
 # CHECK-NEXT:     Section: .text
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 # CHECK-NEXT: ProgramHeaders [
 # CHECK-NEXT:   ProgramHeader {
 # CHECK-NEXT:     Type: PT_PHDR (0x6)
 # CHECK-NEXT:     Offset: 0x40
-# CHECK-NEXT:     VirtualAddress: 0x10040
-# CHECK-NEXT:     PhysicalAddress: 0x10040
+# CHECK-NEXT:     VirtualAddress: 0x200040
+# CHECK-NEXT:     PhysicalAddress: 0x200040
 # CHECK-NEXT:     FileSize: 224
 # CHECK-NEXT:     MemSize: 224
 # CHECK-NEXT:     Flags [ (0x4)
 # CHECK-NEXT:       PF_R (0x4)
 # CHECK-NEXT:     ]
 # CHECK-NEXT:     Alignment: 8
 # CHECK-NEXT:   }
 # CHECK-NEXT:   ProgramHeader {
 # CHECK-NEXT:     Type: PT_LOAD (0x1)
 # CHECK-NEXT:     Offset: 0x0
-# CHECK-NEXT:     VirtualAddress: 0x10000
-# CHECK-NEXT:     PhysicalAddress: 0x10000
+# CHECK-NEXT:     VirtualAddress: 0x200000
+# CHECK-NEXT:     PhysicalAddress: 0x200000
 # CHECK-NEXT:     FileSize: 288
 # CHECK-NEXT:     MemSize: 288
 # CHECK-NEXT:     Flags [
 # CHECK-NEXT:       PF_R
 # CHECK-NEXT:     ]
 # CHECK-NEXT:     Alignment: 4096
 # CHECK-NEXT:   }
 # CHECK-NEXT:   ProgramHeader {
 # CHECK-NEXT:     Type: PT_LOAD (0x1)
 # CHECK-NEXT:     Offset: 0x1000
-# CHECK-NEXT:     VirtualAddress: 0x11000
-# CHECK-NEXT:     PhysicalAddress: 0x11000
+# CHECK-NEXT:     VirtualAddress: 0x201000
+# CHECK-NEXT:     PhysicalAddress: 0x201000
 # CHECK-NEXT:     FileSize: 16
 # CHECK-NEXT:     MemSize: 16
 # CHECK-NEXT:     Flags [ (0x5)
 # CHECK-NEXT:       PF_R (0x4)
 # CHECK-NEXT:       PF_X (0x1)
 # CHECK-NEXT:     ]
 # CHECK-NEXT:     Alignment: 4096
 # CHECK-NEXT:   }

lld/trunk/test/ELF/bss.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2
 // RUN: llvm-readobj -sections %t2 | FileCheck %s
 // REQUIRES: x86
 
 // Test that bss takes no space on disk.
 
 // CHECK:        Name: .bss
 // CHECK-NEXT:   Type: SHT_NOBITS
 // CHECK-NEXT:   Flags [
 // CHECK-NEXT:     SHF_ALLOC
 // CHECK-NEXT:     SHF_WRITE
 // CHECK-NEXT:   ]
-// CHECK-NEXT:   Address: 0x11000
+// CHECK-NEXT:   Address: 0x201000
 // CHECK-NEXT:   Offset: 0x1000
 // CHECK-NEXT:   Size: 4
 // CHECK-NEXT:   Link: 0
 // CHECK-NEXT:   Info: 0
 // CHECK-NEXT:   AddressAlignment:
 // CHECK-NEXT:   EntrySize: 0
 // CHECK-NEXT: }
 
         .global _start
 _start:
 
         .bss
         .zero 4

lld/trunk/test/ELF/build-id.s

_start:
   nop
 
 .section .note.test, "a", @note
    .quad 42
 
 # DEFAULT:      Contents of section .note.test:
 # DEFAULT:      Contents of section .note.gnu.build-id:
 # DEFAULT-NEXT: 04000000 08000000 03000000 474e5500  ............GNU.
-# DEFAULT-NEXT: 6a
+# DEFAULT-NEXT: d08dafb4 e6294b62
 
 # MD5:      Contents of section .note.gnu.build-id:
 # MD5-NEXT: 04000000 10000000 03000000 474e5500  ............GNU.
 # MD5-NEXT: 37
 
 # SHA1:      Contents of section .note.gnu.build-id:
 # SHA1-NEXT: 04000000 14000000 03000000 474e5500  ............GNU.
-# SHA1-NEXT: 79
+# SHA1-NEXT: 7a4f4eaf 69ceb948 4a7d6e51 2225e87c
 
 # UUID:      Contents of section .note.gnu.build-id:
 # UUID-NEXT: 04000000 10000000 03000000 474e5500  ............GNU.
 
 # HEX:      Contents of section .note.gnu.build-id:
 # HEX-NEXT: 04000000 04000000 03000000 474e5500  ............GNU.
 # HEX-NEXT: 12345678
 
 # NONE-NOT: Contents of section .note.gnu.build-id:

lld/trunk/test/ELF/common.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/common.s -o %t2
 // RUN: ld.lld %t %t2 -o %t3
 // RUN: llvm-readobj -t -s %t3 | FileCheck %s
 // REQUIRES: x86
 
 // CHECK:      Name: .bss
 // CHECK-NEXT: Type: SHT_NOBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x11000
+// CHECK-NEXT: Address: 0x201000
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: 22
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 16
 
 // CHECK:      Name: sym1
-// CHECK-NEXT: Value: 0x11004
+// CHECK-NEXT: Value: 0x201004
 // CHECK-NEXT: Size: 8
 // CHECK-NEXT: Binding: Global
 // CHECK-NEXT: Type: Object
 // CHECK-NEXT: Other: 0
 // CHECK-NEXT: Section: .bss
 
 // CHECK:      Name: sym2
-// CHECK-NEXT: Value: 0x1100C
+// CHECK-NEXT: Value: 0x20100C
 // CHECK-NEXT: Size: 8
 // CHECK-NEXT: Binding: Global
 // CHECK-NEXT: Type: Object
 // CHECK-NEXT: Other: 0
 // CHECK-NEXT: Section: .bss
 
 // CHECK:      Name: sym3
-// CHECK-NEXT: Value: 0x11014
+// CHECK-NEXT: Value: 0x201014
 // CHECK-NEXT: Size: 2
 // CHECK-NEXT: Binding: Global
 // CHECK-NEXT: Type: Object
 // CHECK-NEXT: Other: 0
 // CHECK-NEXT: Section: .bss
 
 // CHECK:      Name: sym4
-// CHECK-NEXT: Value: 0x11000
+// CHECK-NEXT: Value: 0x201000
 // CHECK-NEXT: Size: 4
 // CHECK-NEXT: Binding: Global
 // CHECK-NEXT: Type: Object
 // CHECK-NEXT: Other: 0
 // CHECK-NEXT: Section: .bss
 
 
 .globl _start
 _start:
 
 .comm sym1,4,4
 .comm sym2,8,4
 .comm sym3,2,2
 .comm sym4,4,2

lld/trunk/test/ELF/discard-locals.s

 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: Undefined
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: _start
-// CHECK-NEXT:     Value: 0x11000
+// CHECK-NEXT:     Value: 0x201000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: .text
 // CHECK-NEXT:   }
 // CHECk-NEXT: ]

lld/trunk/test/ELF/dynamic-list.s

 # CHECK-NEXT:     Size: 0
 # CHECK-NEXT:     Binding: Local
 # CHECK-NEXT:     Type: None
 # CHECK-NEXT:     Other: 0
 # CHECK-NEXT:     Section: Undefined
 # CHECK-NEXT:   }
 # CHECK-NEXT:   Symbol {
 # CHECK-NEXT:     Name: foo1@
-# CHECK-NEXT:     Value: 0x11000
+# CHECK-NEXT:     Value: 0x201000
 # CHECK-NEXT:     Size: 0
 # CHECK-NEXT:     Binding: Global (0x1)
 # CHECK-NEXT:     Type: None (0x0)
 # CHECK-NEXT:     Other: 0
 # CHECK-NEXT:     Section: .text (0x4)
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 

 # CHECK2-NEXT:     Size: 0
 # CHECK2-NEXT:     Binding: Local
 # CHECK2-NEXT:     Type: None
 # CHECK2-NEXT:     Other: 0
 # CHECK2-NEXT:     Section: Undefined
 # CHECK2-NEXT:   }
 # CHECK2-NEXT:   Symbol {
 # CHECK2-NEXT:     Name: foo1@
-# CHECK2-NEXT:     Value: 0x11000
+# CHECK2-NEXT:     Value: 0x201000
 # CHECK2-NEXT:     Size: 0
 # CHECK2-NEXT:     Binding: Global (0x1)
 # CHECK2-NEXT:     Type: None (0x0)
 # CHECK2-NEXT:     Other: 0
 # CHECK2-NEXT:     Section: .text (0x4)
 # CHECK2-NEXT:   }
 # CHECK2-NEXT:   Symbol {
 # CHECK2-NEXT:     Name: foo2@
-# CHECK2-NEXT:     Value: 0x11001
+# CHECK2-NEXT:     Value: 0x201001
 # CHECK2-NEXT:     Size: 0
 # CHECK2-NEXT:     Binding: Global (0x1)
 # CHECK2-NEXT:     Type: None (0x0)
 # CHECK2-NEXT:     Other: 0
 # CHECK2-NEXT:     Section: .text (0x4)
 # CHECK2-NEXT:   }
 # CHECK2-NEXT:   Symbol {
 # CHECK2-NEXT:     Name: foo31@
-# CHECK2-NEXT:     Value: 0x11002
+# CHECK2-NEXT:     Value: 0x201002
 # CHECK2-NEXT:     Size: 0
 # CHECK2-NEXT:     Binding: Global (0x1)
 # CHECK2-NEXT:     Type: None (0x0)
 # CHECK2-NEXT:     Other: 0
 # CHECK2-NEXT:     Section: .text (0x4)
 # CHECK2-NEXT:   }
 # CHECK2-NEXT: ]
 

lld/trunk/test/ELF/dynamic-reloc-index.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t
 // RUN: llvm-readobj -r %t | FileCheck %s
 
 // We used to record the wrong symbol index for this test
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.plt {
-// CHECK-NEXT:     0x13018 R_X86_64_JUMP_SLOT bar 0x0
+// CHECK-NEXT:     0x203018 R_X86_64_JUMP_SLOT bar 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
         .global foobar
 foobar:
         .global zedx
 zedx:
         .global _start
 _start:
 .quad bar

lld/trunk/test/ELF/dynamic-reloc.s

 // CHECK-NEXT: EntrySize: 24
 
 // CHECK:      Name: .text
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_EXECINSTR
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x11000
+// CHECK-NEXT: Address: 0x201000
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.plt {
 // CHECK-NEXT:     Relocation {
-// CHECK-NEXT:       Offset: 0x13018
+// CHECK-NEXT:       Offset: 0x203018
 // CHECK-NEXT:       Type: R_X86_64_JUMP_SLOT
 // CHECK-NEXT:       Symbol: bar
 // CHECK-NEXT:       Addend: 0x0
 // CHECK-NEXT:     }
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 // CHECK: DynamicSection [

lld/trunk/test/ELF/edata-etext.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t
 # RUN: llvm-objdump -t -section-headers %t | FileCheck %s
 
 ## This checks that:
 ## 1) Address of _etext is the first location after the last read-only loadable segment.
 ## 2) Address of _edata points to the end of the last non SHT_NOBITS section.
 ##    That is how gold/bfd do. At the same time specs says: "If the address of _edata is
 ##    greater than the address of _etext, the address of _end is same as the address
 ##    of _edata." (https://docs.oracle.com/cd/E53394_01/html/E54766/u-etext-3c.html).
 ## 3) Address of _end is different from _edata because of 2.
 # CHECK:      Sections:
 # CHECK-NEXT:  Idx Name          Size      Address          Type
 # CHECK-NEXT:    0               00000000 0000000000000000
-# CHECK-NEXT:    1 .text         00000001 0000000000011000 TEXT DATA
-# CHECK-NEXT:    2 .data         00000002 0000000000012000 DATA
-# CHECK-NEXT:    3 .bss          00000006 0000000000012004 BSS
+# CHECK-NEXT:    1 .text         00000001 0000000000201000 TEXT DATA
+# CHECK-NEXT:    2 .data         00000002 0000000000202000 DATA
+# CHECK-NEXT:    3 .bss          00000006 0000000000202004 BSS
 # CHECK:      SYMBOL TABLE:
 # CHECK-NEXT:  0000000000000000         *UND* 00000000
-# CHECK-NEXT:  0000000000012002         *ABS* 00000000 _edata
-# CHECK-NEXT:  000000000001200a         *ABS* 00000000 _end
-# CHECK-NEXT:  0000000000011001         *ABS* 00000000 _etext
-# CHECK-NEXT:  0000000000011000         .text 00000000 _start
+# CHECK-NEXT:  0000000000202002         *ABS* 00000000 _edata
+# CHECK-NEXT:  000000000020200a         *ABS* 00000000 _end
+# CHECK-NEXT:  0000000000201001         *ABS* 00000000 _etext
+# CHECK-NEXT:  0000000000201000         .text 00000000 _start
 
 # RUN: ld.lld -r %t.o -o %t2
 # RUN: llvm-objdump -t %t2 | FileCheck %s --check-prefix=RELOCATABLE
 # RELOCATABLE:       0000000000000000 *UND* 00000000 _edata
 # RELOCATABLE-NEXT:  0000000000000000 *UND* 00000000 _end
 # RELOCATABLE-NEXT:  0000000000000000 *UND* 00000000 _etext
 
 .global _start,_end,_etext,_edata
 .text
 _start:
   nop
 .data
   .word 1
 .bss
   .align 4
   .space 6

lld/trunk/test/ELF/eh-frame-hdr-icf.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --icf=all --eh-frame-hdr
 # RUN: llvm-objdump -s %t2 | FileCheck %s
 
 # CHECK: Contents of section .eh_frame_hdr:
-# CHECK-NEXT: 101a0 011b033b b4ffffff 01000000 600e0000
-#                                     ^ FDE count
-# CHECK-NEXT: 101b0 d0ffffff 00000000 00000000
-#                   ^ FDE for f2
+# CHECK-NEXT: 2001a0 011b033b b4ffffff 01000000 600e0000
+#                                      ^ FDE count
+# CHECK-NEXT: 2001b0 d0ffffff 00000000 00000000
+#                    ^ FDE for f2
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
 f1:
   .cfi_startproc
   ret
   .cfi_endproc
 
 .section .text.f2, "ax"
 f2:
   .cfi_startproc
   ret
   .cfi_endproc

lld/trunk/test/ELF/eh-frame-hdr.s

 
 // NOHDR:       Sections [
 // NOHDR-NOT:    Name: .eh_frame_hdr
 // NOHDR:      ProgramHeaders [
 // NOHDR-NOT:   PT_GNU_EH_FRAME
 
 //HDRDISASM:      Disassembly of section foo:
 //HDRDISASM-NEXT: foo:
-//HDRDISASM-NEXT:    11000: 90 nop
+//HDRDISASM-NEXT:    201000: 90 nop
 //HDRDISASM-NEXT: Disassembly of section bar:
 //HDRDISASM-NEXT: bar:
-//HDRDISASM-NEXT:    11001: 90 nop
+//HDRDISASM-NEXT:    201001: 90 nop
 //HDRDISASM-NEXT: Disassembly of section dah:
 //HDRDISASM-NEXT: dah:
-//HDRDISASM-NEXT:    11002: 90 nop
+//HDRDISASM-NEXT:    201002: 90 nop
 
 // HDR:       Sections [
 // HDR:        Section {
 // HDR:        Index: 1
 // HDR-NEXT:    Name: .eh_frame
 // HDR-NEXT:    Type: SHT_PROGBITS
 // HDR-NEXT:    Flags [
 // HDR-NEXT:      SHF_ALLOC
 // HDR-NEXT:    ]
-// HDR-NEXT:    Address: 0x10158
+// HDR-NEXT:    Address: 0x200158
 // HDR-NEXT:    Offset: 0x158
 // HDR-NEXT:    Size: 96
 // HDR-NEXT:    Link: 0
 // HDR-NEXT:    Info: 0
 // HDR-NEXT:    AddressAlignment: 8
 // HDR-NEXT:    EntrySize: 0
 // HDR-NEXT:    SectionData (
 // HDR-NEXT:      0000: 14000000 00000000 017A5200 01781001  |
 // HDR-NEXT:      0010: 1B0C0708 90010000 14000000 1C000000  |
 // HDR-NEXT:      0020: 880E0000 01000000 00000000 00000000  |
 // HDR-NEXT:      0030: 14000000 34000000 710E0000 01000000  |
 // HDR-NEXT:      0040: 00000000 00000000 14000000 4C000000  |
 // 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) = 0x200158 + 0x0020 = 0x200178
+//                    The starting address to which this FDE applies = 0xE88 + 0x200178 = 0x201000
 //                    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) = 0x200158 + 0x0038 = 0x200190
+//                    The starting address to which this FDE applies = 0xE71 + 0x200190 = 0x201001
 //                    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) = 0x200158 + 0x0050 = 0x2001A8
+//                    The starting address to which this FDE applies = 0xE5A + 0x2001A8 = 0x201002
 //                    The number of bytes after the start address to which this FDE applies = 0x01000000 = 1
 // HDR-NEXT:    )
 // HDR-NEXT:  }
 // HDR-NEXT:  Section {
 // HDR-NEXT:    Index: 2
 // HDR-NEXT:    Name: .eh_frame_hdr
 // HDR-NEXT:    Type: SHT_PROGBITS
 // HDR-NEXT:    Flags [
 // HDR-NEXT:      SHF_ALLOC
 // HDR-NEXT:    ]
-// HDR-NEXT:    Address: 0x101B8
+// HDR-NEXT:    Address: 0x2001B8
 // HDR-NEXT:    Offset: 0x1B8
 // HDR-NEXT:    Size: 36
 // HDR-NEXT:    Link: 0
 // HDR-NEXT:    Info: 0
 // HDR-NEXT:    AddressAlignment: 1
 // HDR-NEXT:    EntrySize: 0
 // HDR-NEXT:    SectionData (
 // HDR-NEXT:      0000: 011B033B 9CFFFFFF 03000000 480E0000  |
 // 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(0x200158) - .eh_frame_hdr(0x2001B8) - 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 = 0x201000 - .eh_frame_hdr(0x2001B8) = 0xE48
+//                   B8FFFFFF = address of FDE(1) - .eh_frame_hdr(0x2001B8) =
+//                      = .eh_frame(0x200158) + 24 - 0x2001B8 = 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 = 0x201001 - .eh_frame_hdr(0x2001B8) = 0xE49
+//                   D0FFFFFF = address of FDE(2) - .eh_frame_hdr(0x2001B8) =
+//                      = .eh_frame(0x200158) + 24 + 24 - 0x2001B8 = 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 = 0x201002 - .eh_frame_hdr(0x2001B8) = 0xE4A
+//                   E8FFFFFF = address of FDE(2) - .eh_frame_hdr(0x2001B8) =
+//                      = .eh_frame(0x200158) + 24 + 24 - 0x2001B8 = 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: 0x2001B8
+// HDR-NEXT:   PhysicalAddress: 0x2001B8
 // HDR-NEXT:   FileSize: 36
 // HDR-NEXT:   MemSize: 36
 // HDR-NEXT:   Flags [
 // HDR-NEXT:     PF_R
 // HDR-NEXT:   ]
 // HDR-NEXT:   Alignment: 1
 // HDR-NEXT: }

lld/trunk/test/ELF/ehdr_start.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t
 # RUN: llvm-objdump -t %t | FileCheck %s
-# CHECK: 0000000000010040 *ABS* 00000000 .hidden __ehdr_start
+# CHECK: 0000000000200040 *ABS* 00000000 .hidden __ehdr_start
 
 .text
 .global _start, __ehdr_start
 _start:
   .quad __ehdr_start
 
 # RUN: ld.lld -r %t.o -o %t.r
 # RUN: llvm-objdump -t %t.r | FileCheck %s --check-prefix=RELOCATABLE
 
 # RELOCATABLE: 0000000000000000 *UND* 00000000 __ehdr_start

lld/trunk/test/ELF/ehframe-relocation.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/ehframe-relocation.s  -o %t2.o
 // RUN: ld.lld %t.o %t2.o -o %t
 // RUN: llvm-readobj -s %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
 // CHECK:      Name: .eh_frame
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x10120
+// CHECK-NEXT: Address: 0x200120
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: 48
 // CHECK-NOT: .eh_frame
 
-// 0x10120 = 65824
-// 0x10120 + 5 = 65829
+// 0x200120 = 2097440
+// 0x200120 + 5 = 2097445
 // DISASM:      Disassembly of section .text:
 // DISASM-NEXT: _start:
-// DISASM-NEXT:    11000: {{.*}} movq 65824, %rax
-// DISASM-NEXT:    11008: {{.*}} movq 65829, %rax
+// DISASM-NEXT:   201000: {{.*}} movq 2097440, %rax
+// DISASM-NEXT:   201008: {{.*}} movq 2097445, %rax
 
 .section .eh_frame,"ax",@unwind
 
 .section .text
 .globl _start
 _start:
  movq .eh_frame, %rax
  movq .eh_frame + 5, %rax

lld/trunk/test/ELF/end-update.s

 // Should set the value of the "end" symbol if it is undefined.
 // REQUIRES: x86
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t
 // RUN: llvm-readobj -sections -symbols %t | FileCheck %s
 
 // CHECK: Sections [
 // CHECK:     Name: .bss
 // CHECK-NEXT:     Type:
 // CHECK-NEXT:     Flags [
 // CHECK-NEXT:       SHF_ALLOC
 // CHECK-NEXT:       SHF_WRITE
 // CHECK-NEXT:     ]
-// CHECK-NEXT:     Address: 0x12000
+// CHECK-NEXT:     Address: 0x202000
 // CHECK-NEXT:     Offset:
 // CHECK-NEXT:     Size: 6
 // CHECK: ]
 // CHECK: Symbols [
 // CHECK:     Name: end
-// CHECK-NEXT:     Value: 0x12006
+// CHECK-NEXT:     Value: 0x202006
 // CHECK: ]
 
 .global _start,end
 .text
 _start:
     nop
 .bss
     .space 6

lld/trunk/test/ELF/end.s

 // Should set the value of the "_end" symbol to the end of the data segment.
 // REQUIRES: x86
 
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 
 // By default, the .bss section is the latest section of the data segment.
 // RUN: ld.lld %t.o -o %t
 // RUN: llvm-readobj -sections -symbols %t | FileCheck %s --check-prefix=DEFAULT
 
 // DEFAULT: Sections [
 // DEFAULT:     Name: .bss
 // DEFAULT-NEXT:     Type:
 // DEFAULT-NEXT:     Flags [
 // DEFAULT-NEXT:       SHF_ALLOC
 // DEFAULT-NEXT:       SHF_WRITE
 // DEFAULT-NEXT:     ]
-// DEFAULT-NEXT:     Address: 0x12002
+// DEFAULT-NEXT:     Address: 0x202002
 // DEFAULT-NEXT:     Offset:
 // DEFAULT-NEXT:     Size: 6
 // DEFAULT: ]
 // DEFAULT: Symbols [
 // DEFAULT:     Name: _end
-// DEFAULT-NEXT:     Value: 0x12008
+// DEFAULT-NEXT:     Value: 0x202008
 // DEFAULT: ]
 
 // RUN: ld.lld -r %t.o -o %t2
 // RUN: llvm-objdump -t %t2 | FileCheck %s --check-prefix=RELOCATABLE
 // RELOCATABLE: 0000000000000000 *UND* 00000000 _end
 
 .global _start,_end
 .text
 _start:
     nop
 .data
     .word 1
 .bss
     .space 6

lld/trunk/test/ELF/entry.s

 # RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=HEX %s
 # RUN: ld.lld %t1 -o %t2 -e 0777
 # RUN: llvm-readobj -file-headers %t2 | FileCheck -check-prefix=OCT %s
 
 # WARN: warning: entry symbol foobar not found, assuming 0
 # WARN2: warning: entry symbol _start not found, assuming 0
 
 # NOENTRY: Entry: 0x0
-# SYM: Entry: 0x11000
+# SYM: Entry: 0x201000
 # DSO: Entry: 0x1000
 # DEC: Entry: 0x1000
 # HEX: Entry: 0xCAFE
 # OCT: Entry: 0x1FF
 
 .globl entry
 entry:

lld/trunk/test/ELF/gnu-ifunc-gotpcrel.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/gnu-ifunc-gotpcrel.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t2.so
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o %t2.so -o %t
 # RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
 
 # CHECK:      Dynamic Relocations {
-# CHECK-NEXT:   0x120B0 R_X86_64_GLOB_DAT foo 0x0
+# CHECK-NEXT:   0x2020B0 R_X86_64_GLOB_DAT foo 0x0
 # CHECK-NEXT: }
 
 .globl _start
 _start:
 mov foo@gotpcrel(%rip), %rax

lld/trunk/test/ELF/gnu-ifunc.s

 // CHECK-NEXT:  Size: 48
 // CHECK-NEXT:  Link: 6
 // CHECK-NEXT:  Info: 0
 // CHECK-NEXT:  AddressAlignment: 8
 // CHECK-NEXT:  EntrySize: 24
 // 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:     0x202018 R_X86_64_IRELATIVE
+// CHECK-NEXT:     0x202020 R_X86_64_IRELATIVE
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 // CHECK:      Symbols [
 // CHECK-NEXT:  Symbol {
 // CHECK-NEXT:    Name:
 // CHECK-NEXT:    Value: 0x0
 // CHECK-NEXT:    Size: 0
 // CHECK-NEXT:    Binding: Local
 // CHECK-NEXT:    Type: None
 // CHECK-NEXT:    Other: 0
 // CHECK-NEXT:    Section: Undefined
 // CHECK-NEXT:  }
 // CHECK-NEXT:  Symbol {
 // CHECK-NEXT:    Name: __rela_iplt_end
-// CHECK-NEXT:    Value: 0x10188
+// CHECK-NEXT:    Value: 0x200188
 // CHECK-NEXT:    Size: 0
 // CHECK-NEXT:    Binding: Local
 // CHECK-NEXT:    Type: None
 // CHECK-NEXT:    Other [
 // CHECK-NEXT:      STV_HIDDEN
 // CHECK-NEXT:    ]
 // CHECK-NEXT:    Section: .rela.plt
 // CHECK-NEXT:  }
 // CHECK-NEXT:  Symbol {
 // CHECK-NEXT:    Name: __rela_iplt_start
 // CHECK-NEXT:    Value: [[RELA]]
 // CHECK-NEXT:    Size: 0
 // CHECK-NEXT:    Binding: Local
 // CHECK-NEXT:    Type: None
 // CHECK-NEXT:    Other [
 // CHECK-NEXT:      STV_HIDDEN
 // CHECK-NEXT:    ]
 // CHECK-NEXT:    Section: .rela.plt
 // CHECK-NEXT:  }
 // CHECK-NEXT:  Symbol {
 // CHECK-NEXT:    Name: _start
-// CHECK-NEXT:    Value: 0x11002
+// CHECK-NEXT:    Value: 0x201002
 // CHECK-NEXT:    Size: 0
 // CHECK-NEXT:    Binding: Global
 // CHECK-NEXT:    Type: None
 // CHECK-NEXT:    Other: 0
 // CHECK-NEXT:    Section: .text
 // CHECK-NEXT:  }
 // CHECK-NEXT:  Symbol {
 // CHECK-NEXT:    Name: bar
-// CHECK-NEXT:    Value: 0x11001
+// CHECK-NEXT:    Value: 0x201001
 // CHECK-NEXT:    Size: 0
 // CHECK-NEXT:    Binding: Global
 // CHECK-NEXT:    Type: GNU_IFunc
 // CHECK-NEXT:    Other: 0
 // CHECK-NEXT:    Section: .text
 // CHECK-NEXT:  }
 // CHECK-NEXT:  Symbol {
 // CHECK-NEXT:    Name: foo
-// CHECK-NEXT:    Value: 0x11000
+// CHECK-NEXT:    Value: 0x201000
 // CHECK-NEXT:    Size: 0
 // CHECK-NEXT:    Binding: Global
 // CHECK-NEXT:    Type: GNU_IFunc
 // CHECK-NEXT:    Other: 0
 // CHECK-NEXT:    Section: .text
 // CHECK-NEXT:  }
 // CHECK-NEXT: ]
 
 // DISASM:      Disassembly of section .text:
 // DISASM-NEXT: foo:
-// DISASM-NEXT:    11000: {{.*}} retq
+// DISASM-NEXT:   201000: {{.*}} retq
 // DISASM:      bar:
-// DISASM-NEXT:    11001: {{.*}} retq
+// DISASM-NEXT:   201001: {{.*}} retq
 // DISASM:      _start:
-// DISASM-NEXT:    11002: {{.*}} callq 41
-// DISASM-NEXT:    11007: {{.*}} callq 52
-// DISASM-NEXT:    1100c: {{.*}} movl $65880, %edx
-// DISASM-NEXT:    11011: {{.*}} movl $65928, %edx
-// DISASM-NEXT:    11016: {{.*}} movl $65929, %edx
+// DISASM-NEXT:   201002: {{.*}} callq 41
+// DISASM-NEXT:   201007: {{.*}} callq 52
+// DISASM-NEXT:   20100c: {{.*}} movl $2097496, %edx
+// DISASM-NEXT:   201011: {{.*}} movl $2097544, %edx
+// DISASM-NEXT:   201016: {{.*}} movl $2097545, %edx
 // DISASM-NEXT: Disassembly of section .plt:
 // DISASM-NEXT: .plt:
-// DISASM-NEXT:    11020: {{.*}} pushq 4066(%rip)
-// DISASM-NEXT:    11026: {{.*}} jmpq *4068(%rip)
-// DISASM-NEXT:    1102c: {{.*}} nopl (%rax)
-// DISASM-NEXT:    11030: {{.*}} jmpq *4066(%rip)
-// DISASM-NEXT:    11036: {{.*}} pushq $0
-// DISASM-NEXT:    1103b: {{.*}} jmp -32
-// DISASM-NEXT:    11040: {{.*}} jmpq *4058(%rip)
-// DISASM-NEXT:    11046: {{.*}} pushq $1
-// DISASM-NEXT:    1104b: {{.*}} jmp -48
+// DISASM-NEXT:   201020: {{.*}} pushq 4066(%rip)
+// DISASM-NEXT:   201026: {{.*}} jmpq *4068(%rip)
+// DISASM-NEXT:   20102c: {{.*}} nopl (%rax)
+// DISASM-NEXT:   201030: {{.*}} jmpq *4066(%rip)
+// DISASM-NEXT:   201036: {{.*}} pushq $0
+// DISASM-NEXT:   20103b: {{.*}} jmp -32
+// DISASM-NEXT:   201040: {{.*}} jmpq *4058(%rip)
+// DISASM-NEXT:   201046: {{.*}} pushq $1
+// DISASM-NEXT:   20104b: {{.*}} jmp -48
 
 .text
 .type foo STT_GNU_IFUNC
 .globl foo
 foo:
  ret
 
 .type bar STT_GNU_IFUNC

lld/trunk/test/ELF/got.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t
 // RUN: llvm-readobj -s -r %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 // REQUIRES: x86
 
 // CHECK:      Name: .got
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x120B0
+// CHECK-NEXT: Address: 0x2020B0
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: 16
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 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:     0x2020B0 R_X86_64_GLOB_DAT bar 0x0
+// CHECK-NEXT:     0x2020B8 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
+//  0x2020B0 - (0x201000 + 2) - 4 = 4266
+//  0x2020B0 - (0x201006 + 2) - 4 = 4260
+//  0x2020A8 - (0x20100c + 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:  201000:  {{.*}}  jmpq  *4266(%rip)
+// DISASM-NEXT:  201006:  {{.*}}  jmpq  *4260(%rip)
+// DISASM-NEXT:  20100c:  {{.*}}  jmpq  *4262(%rip)
 
 .global _start
 _start:
   jmp *bar@GOTPCREL(%rip)
   jmp *bar@GOTPCREL(%rip)
   jmp *zed@GOTPCREL(%rip)

lld/trunk/test/ELF/gotpc-relax-nopic.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -relax-relocations -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t1
 # RUN: llvm-readobj -symbols -r %t1 | FileCheck --check-prefix=SYMRELOC %s
 # RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 ## There is no relocations.
 # SYMRELOC:      Relocations [
 # SYMRELOC-NEXT: ]
 # SYMRELOC:      Symbols [
 # SYMRELOC:       Symbol {
 # SYMRELOC:        Name: bar
-# SYMRELOC-NEXT:   Value: 0x12000
+# SYMRELOC-NEXT:   Value: 0x202000
 
-## 73728 = 0x12000 (bar)
+## 2105344 = 0x202000 (bar)
 # DISASM:      Disassembly of section .text:
 # DISASM-NEXT: _start:
-# DISASM-NEXT:    11000: {{.*}} adcq  $73728, %rax
-# DISASM-NEXT:    11007: {{.*}} addq  $73728, %rbx
-# DISASM-NEXT:    1100e: {{.*}} andq  $73728, %rcx
-# DISASM-NEXT:    11015: {{.*}} cmpq  $73728, %rdx
-# DISASM-NEXT:    1101c: {{.*}} orq   $73728, %rdi
-# DISASM-NEXT:    11023: {{.*}} sbbq  $73728, %rsi
-# DISASM-NEXT:    1102a: {{.*}} subq  $73728, %rbp
-# DISASM-NEXT:    11031: {{.*}} xorq  $73728, %r8
-# DISASM-NEXT:    11038: {{.*}} testq $73728, %r15
+# DISASM-NEXT:   201000: {{.*}} adcq  $2105344, %rax
+# DISASM-NEXT:   201007: {{.*}} addq  $2105344, %rbx
+# DISASM-NEXT:   20100e: {{.*}} andq  $2105344, %rcx
+# DISASM-NEXT:   201015: {{.*}} cmpq  $2105344, %rdx
+# DISASM-NEXT:   20101c: {{.*}} orq   $2105344, %rdi
+# DISASM-NEXT:   201023: {{.*}} sbbq  $2105344, %rsi
+# DISASM-NEXT:   20102a: {{.*}} subq  $2105344, %rbp
+# DISASM-NEXT:   201031: {{.*}} xorq  $2105344, %r8
+# DISASM-NEXT:   201038: {{.*}} testq $2105344, %r15
 
 # RUN: ld.lld -shared %t.o -o %t2
 # RUN: llvm-readobj -s -r -d %t2 | FileCheck --check-prefix=SEC-PIC    %s
 # RUN: llvm-objdump -d %t2 | FileCheck --check-prefix=DISASM-PIC %s
 # SEC-PIC:      Section {
 # SEC-PIC:        Index:
 # SEC-PIC:        Name: .got
 # SEC-PIC-NEXT:   Type: SHT_PROGBITS

lld/trunk/test/ELF/gotpc-relax.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -relax-relocations -triple=x86_64-unknown-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t1
 # RUN: llvm-readobj -r %t1 | FileCheck --check-prefix=RELOC %s
 # RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 ## There is no relocations.
 # RELOC:    Relocations [
 # RELOC:    ]
 
-# 0x11003 + 7 - 10 = 0x11000
-# 0x1100a + 7 - 17 = 0x11000
-# 0x11011 + 7 - 23 = 0x11001
-# 0x11018 + 7 - 30 = 0x11001
+# 0x201003 + 7 - 10 = 0x201000
+# 0x20100a + 7 - 17 = 0x201000
+# 0x201011 + 7 - 23 = 0x201001
+# 0x201018 + 7 - 30 = 0x201001
 # DISASM:      Disassembly of section .text:
 # DISASM-NEXT: foo:
-# DISASM-NEXT:   11000: 90 nop
+# DISASM-NEXT:   201000: 90 nop
 # DISASM:      hid:
-# DISASM-NEXT:   11001: 90 nop
+# DISASM-NEXT:   201001: 90 nop
 # DISASM:      ifunc:
-# DISASM-NEXT:   11002: c3 retq
+# DISASM-NEXT:   201002: c3 retq
 # DISASM:      _start:
 # DISASM-NEXT: leaq -10(%rip), %rax
 # DISASM-NEXT: leaq -17(%rip), %rax
 # DISASM-NEXT: leaq -23(%rip), %rax
 # DISASM-NEXT: leaq -30(%rip), %rax
 # DISASM-NEXT: movq 4058(%rip), %rax
 # DISASM-NEXT: movq 4051(%rip), %rax
 # DISASM-NEXT: leaq -52(%rip), %rax

lld/trunk/test/ELF/icf7.s

 # REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: ld.lld %t -o %t2 --icf=all --verbose | FileCheck %s
 # RUN: llvm-objdump -t %t2 | FileCheck -check-prefix=ALIGN %s
 
 # CHECK: selected .text.f2
 # CHECK:   removed .text.f1
 
-# ALIGN: 0000000000011000 .text 00000000 _start
-# ALIGN: 0000000000011100 .text 00000000 f1
+# ALIGN: 0000000000201000 .text 00000000 _start
+# ALIGN: 0000000000201100 .text 00000000 f1
 
 .globl _start, f1, f2
 _start:
   ret
 
 .section .text.f1, "ax"
   .align 1
 f1:

lld/trunk/test/ELF/linkerscript/page-size.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 
 # RUN: ld.lld -z max-page-size=0x4000 %t -o %t2
 # RUN: llvm-readobj -program-headers %t2 | FileCheck %s
 
 # CHECK:      ProgramHeaders [
 # CHECK:        ProgramHeader {
 # CHECK:          Type: PT_LOAD
 # CHECK-NEXT:     Offset: 0x0
-# CHECK-NEXT:     VirtualAddress: 0x10000
-# CHECK-NEXT:     PhysicalAddress: 0x10000
+# CHECK-NEXT:     VirtualAddress: 0x200000
+# CHECK-NEXT:     PhysicalAddress: 0x200000
 # CHECK-NEXT:     FileSize: 344
 # CHECK-NEXT:     MemSize: 344
 # CHECK-NEXT:     Flags [
 # CHECK-NEXT:       PF_R
 # CHECK-NEXT:     ]
 # CHECK-NEXT:     Alignment: 16384
 # 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: 0x204000
+# CHECK-NEXT:     PhysicalAddress: 0x204000
 # 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:   }
 # CHECK-NEXT:   ProgramHeader {
 # CHECK-NEXT:     Type: PT_LOAD
 # CHECK-NEXT:     Offset: 0x8000
-# CHECK-NEXT:     VirtualAddress: 0x18000
-# CHECK-NEXT:     PhysicalAddress: 0x18000
+# CHECK-NEXT:     VirtualAddress: 0x208000
+# CHECK-NEXT:     PhysicalAddress: 0x208000
 # 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:   }

lld/trunk/test/ELF/linkerscript/symbols-synthetic.s

 # Check that we can specify synthetic symbols without defining SECTIONS.
 # RUN: echo "PROVIDE_HIDDEN(_begin_sec = _start); \
 # RUN:       PROVIDE_HIDDEN(_end_sec = ADDR(.text) + SIZEOF(.text));" > %t.script
 # RUN: ld.lld -o %t1 --eh-frame-hdr --script %t.script %t
 # RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=NO-SEC %s
 
 # Check that we can do the same as above inside SECTIONS block.
 # RUN: echo "SECTIONS { \
-# RUN:        . = 0x11000; \
+# RUN:        . = 0x201000; \
 # RUN:        .text : { *(.text) } \
 # RUN:        PROVIDE_HIDDEN(_begin_sec = ADDR(.text)); \
 # RUN:        PROVIDE_HIDDEN(_end_sec = ADDR(.text) + SIZEOF(.text)); }" > %t.script
 # RUN: ld.lld -o %t1 --eh-frame-hdr --script %t.script %t
 # RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=IN-SEC %s
 
 # SIMPLE:      0000000000000128         .foo    00000000 .hidden _end_sec
 # SIMPLE-NEXT: 0000000000000120         .foo    00000000 _begin_sec
 # SIMPLE-NEXT: 0000000000000128         *ABS*   00000000 _end_sec_abs
 # SIMPLE-NEXT: 0000000000001048         .text   00000000 _start
 # SIMPLE-NEXT: 0000000000000120         .foo    00000000 begin_foo
 # SIMPLE-NEXT: 0000000000000128         .foo    00000000 end_foo
 # SIMPLE-NEXT: 0000000000000008         *ABS*   00000000 size_foo_1
 # SIMPLE-NEXT: 0000000000000008         *ABS*   00000000 size_foo_1_abs
 # SIMPLE-NEXT: 0000000000001000         .foo    00000000 begin_bar
 # SIMPLE-NEXT: 0000000000001004         .foo    00000000 end_bar
 # SIMPLE-NEXT: 0000000000000ee4         *ABS*   00000000 size_foo_2
 # SIMPLE-NEXT: 0000000000000ee4         *ABS*   00000000 size_foo_3
 # SIMPLE-NEXT: 0000000000001004         .eh_frame_hdr     00000000 __eh_frame_hdr_start
 # SIMPLE-NEXT: 0000000000001010         *ABS*             00000000 __eh_frame_hdr_start2
 # SIMPLE-NEXT: 0000000000001018         .eh_frame_hdr     00000000 __eh_frame_hdr_end
 # SIMPLE-NEXT: 0000000000001020         *ABS*             00000000 __eh_frame_hdr_end2
 
-# NO-SEC:       0000000000011000         .text     00000000 .hidden _begin_sec
-# NO-SEC-NEXT:  0000000000011001         .text     00000000 .hidden _end_sec
+# NO-SEC:       0000000000201000         .text     00000000 .hidden _begin_sec
+# NO-SEC-NEXT:  0000000000201001         .text     00000000 .hidden _end_sec
 
-# IN-SEC:       0000000000011000         .text     00000000 .hidden _begin_sec
-# IN-SEC-NEXT:  0000000000011001         .text     00000000 .hidden _end_sec
+# IN-SEC:       0000000000201000         .text     00000000 .hidden _begin_sec
+# IN-SEC-NEXT:  0000000000201001         .text     00000000 .hidden _end_sec
 
 .global _start
 _start:
  nop
 
 .section .foo,"a"
  .quad 0
 

lld/trunk/test/ELF/local-got.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 // RUN: ld.lld -shared %t2.o -o %t2.so
 // RUN: ld.lld %t.o %t2.so -o %t
 // RUN: llvm-readobj -s -r -section-data %t | FileCheck %s
 // RUN: llvm-objdump -d %t | FileCheck --check-prefix=DISASM %s
 
         .globl _start
 _start:
   call bar@gotpcrel
   call foo@gotpcrel
 
         .global foo
 foo:
         nop
 
-// 0x120B0 - 0x11000 - 5 =  4251
-// 0x120B8 - 0x11005 - 5 =  4254
+// 0x2020B0 - 0x201000 - 5 =  4251
+// 0x2020B8 - 0x201005 - 5 =  4254
 // DISASM:      _start:
-// DISASM-NEXT:   11000: {{.*}} callq 4267
-// DISASM-NEXT:   11005: {{.*}} callq 4270
+// DISASM-NEXT:   201000: {{.*}} callq 4267
+// DISASM-NEXT:   201005: {{.*}} callq 4270
 
 // DISASM:      foo:
-// DISASM-NEXT:   1100a: {{.*}} nop
+// DISASM-NEXT:   20100a: {{.*}} nop
 
 // CHECK:      Name: .got
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x120B0
+// CHECK-NEXT: Address: 0x2020B0
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: 16
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 8
 // CHECK-NEXT: EntrySize: 0
 // CHECK-NEXT: SectionData (
-// 0x1200a in little endian
-// CHECK-NEXT:   0000:  00000000 00000000 0A100100 00000000
+// 0x20200a in little endian
+// CHECK-NEXT:   0000:  00000000 00000000 0A102000 00000000
 // CHECK-NEXT: )
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:     0x120B0 R_X86_64_GLOB_DAT bar 0x0
+// CHECK-NEXT:     0x2020B0 R_X86_64_GLOB_DAT bar 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]

lld/trunk/test/ELF/local.s

 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: Absolute
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: blah
-// CHECK-NEXT:     Value: 0x11000
+// CHECK-NEXT:     Value: 0x201000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: .text
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: foo
-// CHECK-NEXT:     Value: 0x11000
+// CHECK-NEXT:     Value: 0x201000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: .text
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: goo
-// CHECK-NEXT:     Value: 0x11000
+// CHECK-NEXT:     Value: 0x201000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: .text
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: _start
-// CHECK-NEXT:     Value: 0x11000
+// CHECK-NEXT:     Value: 0x201000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: .text
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
 .global _start
 _start:
 
 blah:
 foo:
 goo:
 abs = 42
 .Labs = 43

lld/trunk/test/ELF/lto/parallel-internalize.ll

 ; CHECK-NEXT:     Size: 0
 ; CHECK-NEXT:     Binding: Local (0x0)
 ; CHECK-NEXT:     Type: None (0x0)
 ; CHECK-NEXT:     Other: 0
 ; CHECK-NEXT:     Section: Undefined (0x0)
 ; CHECK-NEXT:   }
 ; CHECK-NEXT:   Symbol {
 ; CHECK-NEXT:     Name: bar
-; CHECK-NEXT:     Value: 0x11010
+; CHECK-NEXT:     Value: 0x201010
 ; CHECK-NEXT:     Size: 8
 ; CHECK-NEXT:     Binding: Local (0x0)
 ; CHECK-NEXT:     Type: Function (0x2)
 ; CHECK-NEXT:     Other [ (0x2)
 ; CHECK-NEXT:       STV_HIDDEN (0x2)
 ; CHECK-NEXT:     ]
 ; CHECK-NEXT:     Section: .text (0x2)
 ; CHECK-NEXT:   }
 ; CHECK-NEXT:   Symbol {
 ; CHECK-NEXT:     Name: foo
-; CHECK-NEXT:     Value: 0x11000
+; CHECK-NEXT:     Value: 0x201000
 ; CHECK-NEXT:     Size: 8
 ; CHECK-NEXT:     Binding: Global (0x1)
 ; CHECK-NEXT:     Type: Function (0x2)
 ; CHECK-NEXT:     Other: 0
 ; CHECK-NEXT:     Section: .text (0x2)
 ; CHECK-NEXT:   }
 ; CHECK-NEXT: ]
 ; CHECK-NEXT: DynamicSymbols [

lld/trunk/test/ELF/lto/shlib-undefined.ll

 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.o
 ; RUN: echo .global __progname > %t2.s
 ; RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %t2.s -o %t2.o
 ; RUN: ld.lld -shared %t2.o -o %t2.so
 ; RUN: ld.lld -o %t %t.o %t2.so
 ; RUN: llvm-readobj -dyn-symbols %t | FileCheck %s
 
 ; CHECK:      Name:     __progname@
-; CHECK-NEXT: Value:    0x11010
+; CHECK-NEXT: Value:    0x201010
 ; CHECK-NEXT: Size:     1
 ; CHECK-NEXT: Binding:  Global (0x1)
 ; CHECK-NEXT: Type:     Function
 ; CHECK-NEXT: Other:    0
 ; CHECK-NEXT: Section:  .text
 ; CHECK-NEXT: }
 
 target triple = "x86_64-unknown-linux-gnu"

lld/trunk/test/ELF/lto/undefined-puts.ll

define i32 @_start() {
   ret i32 0
 }
 
 declare i32 @printf(i8*, ...)
 
 ; Check that puts symbol is present in the dynamic symbol table and
 ; there's a relocation for it.
 ; CHECK: Dynamic Relocations {
-; CHECK-NEXT:  0x13018 R_X86_64_JUMP_SLOT puts 0x0
+; CHECK-NEXT:  0x203018 R_X86_64_JUMP_SLOT puts 0x0
 ; CHECK-NEXT: }
 
 ; CHECK: DynamicSymbols [
 ; CHECK: Symbol {
 ; CHECK:    Name: puts@

lld/trunk/test/ELF/merge.s

zed:
         .long   0x42
 
 // CHECK:      Name: .mysec
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT:    Flags [
 // CHECK-NEXT:      SHF_ALLOC
 // CHECK-NEXT:      SHF_MERGE
 // CHECK-NEXT:    ]
-// CHECK-NEXT:    Address: 0x10120
+// CHECK-NEXT:    Address: 0x200120
 // CHECK-NEXT:    Offset: 0x120
 // CHECK-NEXT:    Size: 8
 // CHECK-NEXT:    Link: 0
 // CHECK-NEXT:    Info: 0
 // CHECK-NEXT:    AddressAlignment: 4
 // CHECK-NEXT:    EntrySize: 4
 // CHECK-NEXT:    SectionData (
 // CHECK-NEXT:      0000: 10000000 42000000
 // CHECK-NEXT:    )
 
 
-// Address of the constant 0x10 = 0x10120 = 65824
-// Address of the constant 0x42 = 0x10124 = 65828
+// Address of the constant 0x10 = 0x200120 = 2097440
+// Address of the constant 0x42 = 0x200124 = 2097444
 
 // CHECK:      Symbols [
 
 // CHECK:        Name: bar
-// CHECK-NEXT:   Value: 0x10124
+// CHECK-NEXT:   Value: 0x200124
 // CHECK-NEXT:   Size: 0
 // CHECK-NEXT:   Binding: Loca
 // CHECK-NEXT:   Type: None
 // CHECK-NEXT:   Other: 0
 // CHECK-NEXT:   Section: .mysec
 
 // CHECK:        Name: zed
-// CHECK-NEXT:   Value: 0x10124
+// CHECK-NEXT:   Value: 0x200124
 // CHECK-NEXT:   Size: 0
 // CHECK-NEXT:   Binding: Local
 // CHECK-NEXT:   Type: None
 // CHECK-NEXT:   Other: 0
 // CHECK-NEXT:   Section: .mysec
 
 // CHECK:        Name: foo
-// CHECK-NEXT:   Value: 0x10124
+// CHECK-NEXT:   Value: 0x200124
 // CHECK-NEXT:   Size: 0
 // CHECK-NEXT:   Binding: Local
 // CHECK-NEXT:   Type: None
 // CHECK-NEXT:   Other [ (0x2)
 // CHECK-NEXT:     STV_HIDDEN
 // CHECK-NEXT:   ]
 // CHECK-NEXT:   Section: .mysec
 
  // CHECK: ]
 
         .text
         .globl  _start
 _start:
 // DISASM:      Disassembly of section .text:
 // DISASM-NEXT: _start:
 
         movl .mysec, %eax
-// addr(0x10) = 65824
-// DISASM-NEXT:   movl    65824, %eax
+// addr(0x10) = 2097440
+// DISASM-NEXT:   movl    2097440, %eax
 
         movl .mysec+7, %eax
-// addr(0x42) + 3 = 65828 + 3 = 65831
-// DISASM-NEXT:   movl    65831, %eax
+// addr(0x42) + 3 = 2097444 + 3 = 2097447
+// DISASM-NEXT:   movl    2097447, %eax
 
         movl .mysec+8, %eax
-// addr(0x42) = 65828
-// DISASM-NEXT:   movl    65828, %eax
+// addr(0x42) = 2097444
+// DISASM-NEXT:   movl    2097444, %eax
 
         movl bar+7, %eax
-// addr(0x42) + 7 = 65828 + 7 = 65835
-// DISASM-NEXT:   movl    65835, %eax
+// addr(0x42) + 7 = 2097444 + 7 = 2097451
+// DISASM-NEXT:   movl    2097451, %eax
 
         movl bar+8, %eax
-// addr(0x42) + 8 = 65828 + 8 = 65836
-// DISASM-NEXT:   movl    65836, %eax
+// addr(0x42) + 8 = 2097444 + 8 = 2097452
+// DISASM-NEXT:   movl    2097452, %eax
 
         movl foo, %eax
-// addr(0x42) = 65828
-// DISASM-NEXT:   movl    65828, %eax
+// addr(0x42) = 2097444
+// DISASM-NEXT:   movl    2097444, %eax
 
         movl foo+7, %eax
-// addr(0x42) + 7 =  = 65828 + 7 = 65835
-// DISASM-NEXT:   movl    65835, %eax
+// addr(0x42) + 7 =  = 2097444 + 7 = 2097451
+// DISASM-NEXT:   movl    2097451, %eax
 
         movl foo+8, %eax
-// addr(0x42) + 8 =  = 65828 + 8 = 65836
-// DISASM-NEXT:   movl    65836, %eax
+// addr(0x42) + 8 =  = 2097444 + 8 = 2097452
+// DISASM-NEXT:   movl    2097452, %eax
 
 //  From the other file:  movl .mysec, %eax
-// addr(0x42) = 65828
-// DISASM-NEXT:   movl    65828, %eax
+// addr(0x42) = 2097444
+// DISASM-NEXT:   movl    2097444, %eax

lld/trunk/test/ELF/no-inhibit-exec.s

 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 # RUN: not ld.lld %t -o %t2
 # RUN: ld.lld %t --noinhibit-exec -o %t2
 # RUN: llvm-objdump -d %t2 | FileCheck %s
 # REQUIRES: x86
 
 # CHECK: Disassembly of section .text:
 # CHECK-NEXT: _start
-# CHECK-NEXT: 11000: {{.*}} callq -69637
+# CHECK-NEXT: 201000: {{.*}} callq -2101253
 
 # next code will not link without noinhibit-exec flag
 # because of undefined symbol _bar
 .globl _start
 _start:
   call _bar

lld/trunk/test/ELF/noplt-pie.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t2.o
 # RUN: ld.lld -shared %t2.o -o %t2.so
 # RUN: ld.lld %t1.o %t2.so -o %t.out
 # RUN: llvm-readobj -s -r %t.out | FileCheck %s
 
 # CHECK: Section {
 # CHECK-NOT: Name: .plt
 
 # 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:     0x2020B0 R_X86_64_GLOB_DAT bar 0x0
+# CHECK-NEXT:     0x2020B8 R_X86_64_GLOB_DAT zed 0x0
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
 .global _start
 _start:
  movq bar@GOTPCREL(%rip), %rcx
  movq zed@GOTPCREL(%rip), %rcx

lld/trunk/test/ELF/openbsd-randomize.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 # RUN: ld.lld %t -o %t.out
 # RUN: llvm-readobj --program-headers %t.out | FileCheck %s
 
 # CHECK:      ProgramHeader {
 # CHECK:        Type: PT_OPENBSD_RANDOMIZE (0x65A3DBE6)
 # CHECK-NEXT:   Offset: 0x158
-# CHECK-NEXT:   VirtualAddress: 0x10158
-# CHECK-NEXT:   PhysicalAddress: 0x10158
+# CHECK-NEXT:   VirtualAddress: 0x200158
+# CHECK-NEXT:   PhysicalAddress: 0x200158
 # CHECK-NEXT:   FileSize: 8
 # CHECK-NEXT:   MemSize: 8
 # CHECK-NEXT:   Flags [ (0x4)
 # CHECK-NEXT:     PF_R (0x4)
 # CHECK-NEXT:   ]
 # CHECK-NEXT:   Alignment: 1
 # CHECK-NEXT: }
 
 .section .openbsd.randomdata, "a"
 .quad 0

lld/trunk/test/ELF/plt.s

 // CHECK-NEXT: ]
 
 // CHECK2:      Name: .plt
 // CHECK2-NEXT: Type: SHT_PROGBITS
 // CHECK2-NEXT: Flags [
 // CHECK2-NEXT:   SHF_ALLOC
 // CHECK2-NEXT:   SHF_EXECINSTR
 // CHECK2-NEXT: ]
-// CHECK2-NEXT: Address: 0x11020
+// CHECK2-NEXT: Address: 0x201020
 // CHECK2-NEXT: Offset:
 // CHECK2-NEXT: Size: 48
 // CHECK2-NEXT: Link: 0
 // CHECK2-NEXT: Info: 0
 // CHECK2-NEXT: AddressAlignment: 16
 
 // 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:     0x203018 R_X86_64_JUMP_SLOT bar 0x0
+// CHECK2-NEXT:     0x203020 R_X86_64_JUMP_SLOT zed 0x0
 // CHECK2-NEXT:   }
 // CHECK2-NEXT: ]
 
 // Unfortunately FileCheck can't do math, so we have to check for explicit
 // values:
 
 // 0x1030 - (0x1000 + 5) = 43
 // 0x1030 - (0x1005 + 5) = 38

 // DISASM-NEXT:   103b:  e9 e0 ff ff ff     jmp -32 <.plt>
 // DISASM-NEXT:   1040:  ff 25 da 1f 00 00  jmpq *8154(%rip)
 // DISASM-NEXT:   1046:  68 01 00 00 00     pushq $1
 // DISASM-NEXT:   104b:  e9 d0 ff ff ff     jmp -48 <.plt>
 // DISASM-NEXT:   1050:  ff 25 d2 1f 00 00  jmpq *8146(%rip)
 // 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
+// 0x201030 - (0x201000 + 1) - 4 = 43
+// 0x201030 - (0x201005 + 1) - 4 = 38
+// 0x201040 - (0x20100a + 1) - 4 = 49
+// 0x201000 - (0x20100f + 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:   201000:  e9 {{.*}}     jmp  43
+// DISASM2-NEXT:   201005:  e9 {{.*}}     jmp  38
+// DISASM2-NEXT:   20100a:  e9 {{.*}}     jmp  49
+// DISASM2-NEXT:   20100f:  e9 {{.*}}     jmp  -20
 
-// 0x13018 - 0x11036  = 4242
-// 0x13020 - 0x11046  = 4234
+// 0x203018 - 0x201036  = 4242
+// 0x203020 - 0x201046  = 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:  201020:  ff 35 e2 1f 00 00   pushq 8162(%rip)
+// DISASM2-NEXT:  201026:  ff 25 e4 1f 00 00   jmpq *8164(%rip)
+// DISASM2-NEXT:  20102c:  0f 1f 40 00         nopl  (%rax)
+// DISASM2-NEXT:  201030:  ff 25 e2 1f 00 00   jmpq *8162(%rip)
+// DISASM2-NEXT:  201036:  68 00 00 00 00      pushq $0
+// DISASM2-NEXT:  20103b:  e9 e0 ff ff ff      jmp -32 <.plt>
+// DISASM2-NEXT:  201040:  ff 25 da 1f 00 00   jmpq *8154(%rip)
+// DISASM2-NEXT:  201046:  68 01 00 00 00      pushq $1
+// DISASM2-NEXT:  20104b:  e9 d0 ff ff ff      jmp -48 <.plt>
+// DISASM2-NOT:   2010C0
 
 .global _start
 _start:
   jmp bar@PLT
   jmp bar@PLT
   jmp zed@PLT
   jmp _start@plt

lld/trunk/test/ELF/pre_init_fini_array.s

 // CHECK-NEXT: Address: [[FINI_ADDR:.*]]
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: [[FINI_SIZE:.*]]
 
 // CHECK:      Relocations [
 // CHECK-NEXT: ]
 
 // CHECK:        Name: __fini_array_end
-// CHECK-NEXT:   Value: 0x1201B
+// CHECK-NEXT:   Value: 0x20201B
 // CHECK-NEXT:   Size: 0
 // CHECK-NEXT:   Binding: Local
 // CHECK-NEXT:   Type: None
 // CHECK-NEXT:   Other [
 // CHECK-NEXT:     STV_HIDDEN
 // CHECK-NEXT:   ]
 // CHECK-NEXT:   Section: .fini_array
 // CHECK-NEXT: }
 // CHECK-NEXT: Symbol {
 // CHECK-NEXT:   Name: __fini_array_start
 // CHECK-NEXT:   Value: [[FINI_ADDR]]
 // CHECK-NEXT:   Size: 0
 // CHECK-NEXT:   Binding: Local
 // CHECK-NEXT:   Type: None
 // CHECK-NEXT:   Other [
 // CHECK-NEXT:     STV_HIDDEN
 // CHECK-NEXT:   ]
 // CHECK-NEXT:   Section: .fini_array
 // CHECK-NEXT: }
 // CHECK-NEXT: Symbol {
 // CHECK-NEXT:   Name: __init_array_end
-// CHECK-NEXT:   Value: 0x12008
+// CHECK-NEXT:   Value: 0x202008
 // CHECK-NEXT:   Size: 0
 // CHECK-NEXT:   Binding: Local
 // CHECK-NEXT:   Type: None
 // CHECK-NEXT:   Other [
 // CHECK-NEXT:     STV_HIDDEN
 // CHECK-NEXT:   ]
 // CHECK-NEXT:   Section: .init_array
 // CHECK-NEXT: }
 // CHECK-NEXT: Symbol {
 // CHECK-NEXT:   Name: __init_array_start
 // CHECK-NEXT:   Value: [[INIT_ADDR]]
 // CHECK-NEXT:   Size: 0
 // CHECK-NEXT:   Binding: Local
 // CHECK-NEXT:   Type: None
 // CHECK-NEXT:   Other [
 // CHECK-NEXT:     STV_HIDDEN
 // CHECK-NEXT:   ]
 // CHECK-NEXT:   Section: .init_array
 // CHECK-NEXT: }
 // CHECK-NEXT: Symbol {
 // CHECK-NEXT:   Name: __preinit_array_end
-// CHECK-NEXT:   Value: 0x12011
+// CHECK-NEXT:   Value: 0x202011
 // CHECK-NEXT:   Size: 0
 // CHECK-NEXT:   Binding: Local
 // CHECK-NEXT:   Type: None
 // CHECK-NEXT:   Other [
 // CHECK-NEXT:     STV_HIDDEN
 // CHECK-NEXT:   ]
 // CHECK-NEXT:   Section: .preinit_array
 // CHECK-NEXT: }

 // CHECK: PREINIT_ARRAY        [[PREINIT_ADDR]]
 // CHECK: PREINIT_ARRAYSZ      [[PREINIT_SIZE]] (bytes)
 // CHECK: INIT_ARRAY           [[INIT_ADDR]]
 // CHECK: INIT_ARRAYSZ         [[INIT_SIZE]] (bytes)
 // CHECK: FINI_ARRAY           [[FINI_ADDR]]
 // 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
+// 0x202008 - (0x201000 + 5) = 4099
+// 0x202011 - (0x201005 + 5) = 4103
+// 0x202000 - (0x20100a + 5) = 4081
+// 0x202008 - (0x20100f + 5) = 4084
+// 0x202011 - (0x201014 + 5) = 4088
+// 0x20201B - (0x201019 + 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:   201000:  e8 {{.*}}  callq  4099
+// DISASM-NEXT:   201005:  e8 {{.*}}  callq  4103
+// DISASM-NEXT:   20100a:  e8 {{.*}}  callq  4081
+// DISASM-NEXT:   20100f:  e8 {{.*}}  callq  4084
+// DISASM-NEXT:   201014:  e8 {{.*}}  callq  4088
+// DISASM-NEXT:   201019:  e8 {{.*}}  callq  4093

lld/trunk/test/ELF/pre_init_fini_array_missing.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 // RUN: ld.lld %t -o %t2
 // RUN: llvm-objdump -d %t2 | FileCheck %s
 // REQUIRES: x86
 
 .globl _start
 _start:
   call __preinit_array_start
   call __preinit_array_end
   call __init_array_start
   call __init_array_end
   call __fini_array_start
   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 - (0x201000 + 5) = -2101253
+// 0 - (0x201005 + 5) = -2101258
+// 0 - (0x20100a + 5) = -2101263
+// 0 - (0x20100f + 5) = -2101268
+// 0 - (0x201014 + 5) = -2101273
+// 0 - (0x201019 + 5) = -2101278
 
 // 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:   201000:    e8 fb ef df ff     callq    -2101253
+// CHECK-NEXT:   201005:    e8 f6 ef df ff     callq    -2101258
+// CHECK-NEXT:   20100a:    e8 f1 ef df ff     callq    -2101263
+// CHECK-NEXT:   20100f:    e8 ec ef df ff     callq    -2101268
+// CHECK-NEXT:   201014:    e8 e7 ef df ff     callq    -2101273
+// CHECK-NEXT:   201019:    e8 e2 ef df ff     callq    -2101278

lld/trunk/test/ELF/program-header-layout.s

 # CHECK-NEXT:   AddressAlignment:
 # CHECK-NEXT:   EntrySize:
 # CHECK-NEXT: }
 
 # CHECK:      ProgramHeaders [
 # CHECK-NEXT:   ProgramHeader {
 # CHECK-NEXT:     Type: PT_PHDR (0x6)
 # CHECK-NEXT:     Offset: 0x40
-# CHECK-NEXT:     VirtualAddress: 0x10040
-# CHECK-NEXT:     PhysicalAddress: 0x10040
+# CHECK-NEXT:     VirtualAddress: 0x200040
+# CHECK-NEXT:     PhysicalAddress: 0x200040
 # CHECK-NEXT:     FileSize: 280
 # CHECK-NEXT:     MemSize: 280
 # CHECK-NEXT:     Flags [ (0x4)
 # CHECK-NEXT:       PF_R (0x4)
 # CHECK-NEXT:     ]
 # CHECK-NEXT:     Alignment: 8
 # CHECK-NEXT:   }
 # CHECK-NEXT:   ProgramHeader {

lld/trunk/test/ELF/relocatable.s

 # CHECKEXE-NEXT:      FileVersion: 1
 # CHECKEXE-NEXT:      OS/ABI: SystemV (0x0)
 # CHECKEXE-NEXT:      ABIVersion: 0
 # CHECKEXE-NEXT:      Unused: (00 00 00 00 00 00 00)
 # CHECKEXE-NEXT:    }
 # CHECKEXE-NEXT:    Type: Executable
 # CHECKEXE-NEXT:    Machine: EM_X86_64
 # CHECKEXE-NEXT:    Version: 1
-# CHECKEXE-NEXT:    Entry: 0x11000
+# CHECKEXE-NEXT:    Entry: 0x201000
 # CHECKEXE-NEXT:    ProgramHeaderOffset: 0x40
 # CHECKEXE-NEXT:    SectionHeaderOffset: 0x11F8
 # CHECKEXE-NEXT:    Flags [
 # CHECKEXE-NEXT:    ]
 # CHECKEXE-NEXT:    HeaderSize: 64
 # CHECKEXE-NEXT:    ProgramHeaderEntrySize: 56
 # CHECKEXE-NEXT:    ProgramHeaderCount: 5
 # CHECKEXE-NEXT:    SectionHeaderEntrySize: 64

lld/trunk/test/ELF/relocation-common.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: ld.lld %t -o %tout
 // RUN: llvm-objdump -t -d %tout | FileCheck %s
 // REQUIRES: x86
 
 .global _start
 _start:
   movl $1, sym1(%rip)
 
 .global sym1
 .comm sym1,4,4
 
-// CHECK: 11000: {{.*}} movl    $1, 4086(%rip)
-// CHECK: 0000000000012000 g       .bss            00000004 sym1
+// CHECK: 201000: {{.*}} movl    $1, 4086(%rip)
+// CHECK: 0000000000202000 g       .bss            00000004 sym1

lld/trunk/test/ELF/relocation-copy-flags.s

_start:
         .quad z
 
 // CHECK:      Name: .text
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_EXECINSTR
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x11000
+// CHECK-NEXT: Address: 0x201000
 // CHECK-NEXT: Offset: 0x1000
 // CHECK-NEXT: Size: 8
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 4
 // CHECK-NEXT: EntrySize: 0
 // CHECK-NEXT: SectionData (
-// CHECK-NEXT:   0000: 10300100
+// CHECK-NEXT:   0000: 10302000
 // CHECK-NEXT: )
 
 // CHECK:      Name: bar
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x13000
+// CHECK-NEXT: Address: 0x203000
 // CHECK-NEXT: Offset: 0x3000
 // CHECK-NEXT: Size: 8
 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 1
 // CHECK-NEXT: EntrySize: 0
 // CHECK-NEXT: SectionData (
 // CHECK-NEXT:   0000: 00000000

 // CHECK-NEXT: AddressAlignment: 1
 // CHECK-NEXT: EntrySize: 0
 // CHECK-NEXT: SectionData (
 // CHECK-NEXT:   0000: 00000000
 // CHECK-NEXT: )
 
 // 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:     0x203010 R_X86_64_COPY x 0x0
+// CHECK-NEXT:     0x203000 R_X86_64_64 z 0x0
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]

lld/trunk/test/ELF/relocation-copy.s

 movl $z, %edx
 
 // CHECK:      Name: .bss
 // CHECK-NEXT:  Type: SHT_NOBITS (0x8)
 // CHECK-NEXT:  Flags [ (0x3)
 // CHECK-NEXT:   SHF_ALLOC (0x2)
 // CHECK-NEXT:   SHF_WRITE (0x1)
 // CHECK-NEXT:  ]
-// CHECK-NEXT:  Address: 0x13000
+// CHECK-NEXT:  Address: 0x203000
 // CHECK-NEXT:  Offset:
 // CHECK-NEXT:  Size: 24
 // CHECK-NEXT:  Link: 0
 // CHECK-NEXT:  Info: 0
 // CHECK-NEXT:  AddressAlignment: 16
 // CHECK-NEXT:  EntrySize: 0
 
 // CHECK:      Relocations [

 // CHECK-NEXT:       Offset:
 // CHECK-NEXT:       Type: R_X86_64_COPY
 // CHECK-NEXT:       Symbol: z
 // CHECK-NEXT:       Addend: 0x0
 // CHECK-NEXT:     }
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 
-// 77824 = 0x13000
+// 2109440 = 0x203000
 // 16 is alignment here
-// 77840 = 0x13000 + 16
-// 77844 = 0x13000 + 16 + 4
+// 2109456 = 0x203000 + 16
+// 2109460 = 0x203000 + 16 + 4
 // CODE: Disassembly of section .text:
 // CODE-NEXT: _start:
-// CODE-NEXT: 11000: {{.*}} movl $5, 77824
-// CODE-NEXT: 1100b: {{.*}} movl $7, 77840
-// CODE-NEXT: 11016: {{.*}} movl $9, 77844
-// CODE-NEXT: 11021: {{.*}} movl $77824, %edx
-// CODE-NEXT: 11026: {{.*}} movl $77840, %edx
-// CODE-NEXT: 1102b: {{.*}} movl $77844, %edx
+// CODE-NEXT: 201000: {{.*}} movl $5, 2109440
+// CODE-NEXT: 20100b: {{.*}} movl $7, 2109456
+// CODE-NEXT: 201016: {{.*}} movl $9, 2109460
+// CODE-NEXT: 201021: {{.*}} movl $2109440, %edx
+// CODE-NEXT: 201026: {{.*}} movl $2109456, %edx
+// CODE-NEXT: 20102b: {{.*}} movl $2109460, %edx

lld/trunk/test/ELF/relocation-local.s

 .section       .text2,"ax",@progbits
 R_X86_64_32:
   movl $R_X86_64_32, %edx
 
 // FIXME: this would be far more self evident if llvm-objdump printed
 // constants in hex.
 // CHECK: Disassembly of section .text2:
 // CHECK-NEXT: R_X86_64_32:
-// CHECK-NEXT:  11009: {{.*}} movl $69641, %edx
+// CHECK-NEXT:  201009: {{.*}} movl $2101257, %edx
 
 .section .R_X86_64_32S,"ax",@progbits
 R_X86_64_32S:
   movq lulz - 0x100000, %rdx
 
 // CHECK: Disassembly of section .R_X86_64_32S:
 // CHECK-NEXT: R_X86_64_32S:
-// CHECK-NEXT:  {{.*}}: {{.*}} movq -978935, %rdx
+// CHECK-NEXT:  {{.*}}: {{.*}} movq 1052681, %rdx
 
 .section .R_X86_64_64,"a",@progbits
 R_X86_64_64:
  .quad R_X86_64_64
 
 // CHECK:      Contents of section .R_X86_64_64:
-// CHECK-NEXT:   10120 20010100 00000000
+// CHECK-NEXT:   200120 20012000 00000000

lld/trunk/test/ELF/relocation-size-shared.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/relocation-size-shared.s -o %tso.o
 // RUN: ld.lld -shared %tso.o -o %tso
 // RUN: ld.lld %t.o %tso -o %t1
 // RUN: llvm-readobj -r %t1 | FileCheck --check-prefix=RELOCSHARED %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 // 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:    0x203018 R_X86_64_SIZE64 fooshared 0xFFFFFFFFFFFFFFFF
+// RELOCSHARED-NEXT:    0x203020 R_X86_64_SIZE64 fooshared 0x0
+// RELOCSHARED-NEXT:    0x203028 R_X86_64_SIZE64 fooshared 0x1
+// RELOCSHARED-NEXT:    0x203048 R_X86_64_SIZE32 fooshared 0xFFFFFFFFFFFFFFFF
+// RELOCSHARED-NEXT:    0x20304F R_X86_64_SIZE32 fooshared 0x0
+// RELOCSHARED-NEXT:    0x203056 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: 203000: 19 00
+// DISASM-NEXT: 203002: 00 00
+// DISASM-NEXT: 203004: 00 00
+// DISASM-NEXT: 203006: 00 00
+// DISASM-NEXT: 203008: 1a 00
+// DISASM-NEXT: 20300a: 00 00
+// DISASM-NEXT: 20300c: 00 00
+// DISASM-NEXT: 20300e: 00 00
+// DISASM-NEXT: 203010: 1b 00
+// DISASM-NEXT: 203012: 00 00
+// DISASM-NEXT: 203014: 00 00
+// DISASM-NEXT: 203016: 00 00
+// DISASM-NEXT: 203018: 00 00
+// DISASM-NEXT: 20301a: 00 00
+// DISASM-NEXT: 20301c: 00 00
+// DISASM-NEXT: 20301e: 00 00
+// DISASM-NEXT: 203020: 00 00
+// DISASM-NEXT: 203022: 00 00
+// DISASM-NEXT: 203024: 00 00
+// DISASM-NEXT: 203026: 00 00
+// DISASM-NEXT: 203028: 00 00
+// DISASM-NEXT: 20302a: 00 00
+// DISASM-NEXT: 20302c: 00 00
+// DISASM-NEXT: 20302e: 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: 203030: 8b 04 25 19 00 00 00 movl 25, %eax
+// DISASM-NEXT: 203037: 8b 04 25 1a 00 00 00 movl 26, %eax
+// DISASM-NEXT: 20303e: 8b 04 25 1b 00 00 00 movl 27, %eax
+// DISASM-NEXT: 203045: 8b 04 25 00 00 00 00 movl 0, %eax
+// DISASM-NEXT: 20304c: 8b 04 25 00 00 00 00 movl 0, %eax
+// DISASM-NEXT: 203053: 8b 04 25 00 00 00 00 movl 0, %eax
 
 .data
 .global foo
 .type foo,%object
 .size foo,26
 foo:
 .zero 26
 

lld/trunk/test/ELF/relocation-size.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t1
 // RUN: llvm-readobj -r %t1 | FileCheck --check-prefix=NORELOC %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 // RUN: ld.lld -shared %t.o -o %t1
 // RUN: llvm-readobj -r %t1 | FileCheck --check-prefix=RELOCSHARED %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASMSHARED %s
 
 // NORELOC:      Relocations [
 // NORELOC-NEXT: ]
 
 // 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: 202000: 19 00
+// DISASM-NEXT: 202002: 00 00
+// DISASM-NEXT: 202004: 00 00
+// DISASM-NEXT: 202006: 00 00
+// DISASM-NEXT: 202008: 1a 00
+// DISASM-NEXT: 20200a: 00 00
+// DISASM-NEXT: 20200c: 00 00
+// DISASM-NEXT: 20200e: 00 00
+// DISASM-NEXT: 202010: 1b 00
+// DISASM-NEXT: 202012: 00 00
+// DISASM-NEXT: 202014: 00 00
+// DISASM-NEXT: 202016: 00 00
+// DISASM-NEXT: 202018: 19 00
+// DISASM-NEXT: 20201a: 00 00
+// DISASM-NEXT: 20201c: 00 00
+// DISASM-NEXT: 20201e: 00 00
+// DISASM-NEXT: 202020: 1a 00
+// DISASM-NEXT: 202022: 00 00
+// DISASM-NEXT: 202024: 00 00
+// DISASM-NEXT: 202026: 00 00
+// DISASM-NEXT: 202028: 1b 00
+// DISASM-NEXT: 20202a: 00 00
+// DISASM-NEXT: 20202c: 00 00
+// DISASM-NEXT: 20202e: 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: 202030: 8b 04 25 19 00 00 00 movl 25, %eax
+// DISASM-NEXT: 202037: 8b 04 25 1a 00 00 00 movl 26, %eax
+// DISASM-NEXT: 20203e: 8b 04 25 1b 00 00 00 movl 27, %eax
+// DISASM-NEXT: 202045: 8b 04 25 19 00 00 00 movl 25, %eax
+// DISASM-NEXT: 20204c: 8b 04 25 1a 00 00 00 movl 26, %eax
+// DISASM-NEXT: 202053: 8b 04 25 1b 00 00 00 movl 27, %eax
 
 // RELOCSHARED:      Relocations [
 // RELOCSHARED-NEXT: Section ({{.*}}) .rela.dyn {
 // RELOCSHARED-NEXT:    0x3000 R_X86_64_SIZE64 foo 0xFFFFFFFFFFFFFFFF
 // RELOCSHARED-NEXT:    0x3008 R_X86_64_SIZE64 foo 0x0
 // RELOCSHARED-NEXT:    0x3010 R_X86_64_SIZE64 foo 0x1
 // RELOCSHARED-NEXT:    0x3033 R_X86_64_SIZE32 foo 0xFFFFFFFFFFFFFFFF
 // RELOCSHARED-NEXT:    0x303A R_X86_64_SIZE32 foo 0x0

lld/trunk/test/ELF/relocation-undefined-weak.s

 .weak sym1
 
 // CHECK:      Name: .text
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_EXECINSTR
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x11000
+// CHECK-NEXT: Address: 0x201000
 
 // 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 - (0x201000 + 2)) = -2101258
 
-// DISASM: movl    $1, -69642(%rip)
+// DISASM: movl    $1, -2101258(%rip)

lld/trunk/test/ELF/relocation.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/shared.s -o %t2
 // RUN: ld.lld %t2 -o %t2.so -shared
 // RUN: ld.lld %t %t2.so -o %t3
 // RUN: llvm-readobj -s  %t3 | FileCheck --check-prefix=SEC %s
 // RUN: llvm-objdump -s -d %t3 | FileCheck %s
 // REQUIRES: x86
 
 // SEC:      Name: .plt
 // SEC-NEXT: Type: SHT_PROGBITS
 // SEC-NEXT: Flags [
 // SEC-NEXT:   SHF_ALLOC
 // SEC-NEXT:   SHF_EXECINSTR
 // SEC-NEXT: ]
-// SEC-NEXT: Address: 0x11030
+// SEC-NEXT: Address: 0x201030
 // SEC-NEXT: Offset: 0x1030
 // SEC-NEXT: Size: 48
 
 // SEC:         Name: .got
 // SEC-NEXT:   Type: SHT_PROGBITS
 // SEC-NEXT:   Flags [
 // SEC-NEXT:     SHF_ALLOC
 // SEC-NEXT:     SHF_WRITE
 // SEC-NEXT:   ]
-// SEC-NEXT:   Address: 0x120F0
+// SEC-NEXT:   Address: 0x2020F0
 // SEC-NEXT:   Offset:
 // SEC-NEXT:   Size: 8
 // SEC-NEXT:   Link: 0
 // SEC-NEXT:   Info: 0
 // SEC-NEXT:   AddressAlignment: 8
 // SEC-NEXT:   EntrySize: 0
 // SEC-NEXT: }
 
 // SEC:        Name: .got.plt
 // SEC-NEXT:   Type: SHT_PROGBITS
 // SEC-NEXT:   Flags [
 // SEC-NEXT:     SHF_ALLOC
 // SEC-NEXT:     SHF_WRITE
 // SEC-NEXT:   ]
-// SEC-NEXT:   Address: 0x13000
+// SEC-NEXT:   Address: 0x203000
 // SEC-NEXT:   Offset: 0x3000
 // SEC-NEXT:   Size: 40
 // SEC-NEXT:   Link: 0
 // SEC-NEXT:   Info: 0
 // SEC-NEXT:   AddressAlignment: 8
 // SEC-NEXT:   EntrySize: 0
 // SEC-NEXT:   }
 
 .section       .text,"ax",@progbits,unique,1
 .global _start
 _start:
   call lulz
 
 .section       .text,"ax",@progbits,unique,2
 .zero 4
 .global lulz
 lulz:
   nop
 
 // CHECK: Disassembly of section .text:
 // CHECK-NEXT: _start:
-// CHECK-NEXT:   11000:  e8 04 00 00 00   callq 4
-// CHECK-NEXT:   11005:
+// CHECK-NEXT:   201000:  e8 04 00 00 00   callq 4
+// CHECK-NEXT:   201005:
 
 // CHECK:      lulz:
-// CHECK-NEXT:   11009:  90  nop
+// CHECK-NEXT:   201009:  90  nop
 
 
 .section       .text2,"ax",@progbits
 .global R_X86_64_32
 R_X86_64_32:
   movl $R_X86_64_32, %edx
 
 // FIXME: this would be far more self evident if llvm-objdump printed
 // constants in hex.
 // CHECK: Disassembly of section .text2:
 // CHECK-NEXT: R_X86_64_32:
-// CHECK-NEXT:  1100a: {{.*}} movl $69642, %edx
+// CHECK-NEXT:  20100a: {{.*}} movl $2101258, %edx
 
 .section .R_X86_64_32S,"ax",@progbits
 .global R_X86_64_32S
 R_X86_64_32S:
   movq lulz - 0x100000, %rdx
 
 // CHECK: Disassembly of section .R_X86_64_32S:
 // CHECK-NEXT: R_X86_64_32S:
-// CHECK-NEXT:  {{.*}}: {{.*}} movq -978935, %rdx
+// CHECK-NEXT:  {{.*}}: {{.*}} movq 1052681, %rdx
 
 .section .R_X86_64_PC32,"ax",@progbits
 .global R_X86_64_PC32
 R_X86_64_PC32:
  call bar
  movl $bar, %eax
 //16 is a size of PLT[0]
-// 0x11030 + 16 - (0x11017 + 5) = 20
+// 0x201030 + 16 - (0x201017 + 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:  201017:   {{.*}}  callq  36
+// CHECK-NEXT:  20101c:   {{.*}}  movl $2101312, %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 0x201030. The second plt entry is at 0x201050 == 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: 201021: {{.*}}  movl    2101328, %eax
 
 .section .R_X86_64_64,"a",@progbits
 .global R_X86_64_64
 R_X86_64_64:
  .quad R_X86_64_64
 
 // CHECK:      Contents of section .R_X86_64_64:
-// CHECK-NEXT:   101c8 c8010100 00000000
+// CHECK-NEXT:   2001c8 c8012000 00000000
 
 .section .R_X86_64_GOTPCREL,"a",@progbits
 .global R_X86_64_GOTPCREL
 R_X86_64_GOTPCREL:
  .long zed@gotpcrel
 
-// 0x120F8 - 0x101D8 = 7952
+// 0x2020F8 - 0x2001D8 = 7952
 // 7952 = 0x101f0000 in little endian
 // CHECK:      Contents of section .R_X86_64_GOTPCREL
-// CHECK-NEXT:   101d0 201f0000
+// CHECK-NEXT:   2001d0 201f0000
 
 .section .R_X86_64_GOT32,"a",@progbits
 .global R_X86_64_GOT32
 R_X86_64_GOT32:
         .long zed@got
 
 // CHECK: Contents of section .R_X86_64_GOT32:
 // CHECK-NEXT: f8ffffff

lld/trunk/test/ELF/relro.s

 // FULLRELRO:        Section {
 // FULLRELRO:        Index: 9
 // FULLRELRO-NEXT:   Name: .got
 // FULLRELRO-NEXT:   Type: SHT_PROGBITS
 // FULLRELRO-NEXT:   Flags [
 // FULLRELRO-NEXT:     SHF_ALLOC
 // FULLRELRO-NEXT:     SHF_WRITE
 // FULLRELRO-NEXT:   ]
-// FULLRELRO-NEXT:   Address: 0x12110
+// FULLRELRO-NEXT:   Address: 0x202110
 // FULLRELRO-NEXT:   Offset: 0x2110
 // FULLRELRO-NEXT:   Size: 8
 // FULLRELRO-NEXT:   Link: 0
 // FULLRELRO-NEXT:   Info: 0
 // FULLRELRO-NEXT:   AddressAlignment: 8
 // FULLRELRO-NEXT:   EntrySize: 0
 // FULLRELRO-NEXT:   SectionData (
 // FULLRELRO-NEXT:     0000: 00000000 00000000
 // FULLRELRO-NEXT:   )
 // FULLRELRO-NEXT: }
 // FULLRELRO-NEXT: Section {
 // FULLRELRO-NEXT:   Index: 10
 // FULLRELRO-NEXT:   Name: .got.plt
 // FULLRELRO-NEXT:   Type: SHT_PROGBITS
 // FULLRELRO-NEXT:   Flags [
 // FULLRELRO-NEXT:     SHF_ALLOC
 // FULLRELRO-NEXT:     SHF_WRITE
 // FULLRELRO-NEXT:   ]
-// FULLRELRO-NEXT:   Address: 0x12118
+// FULLRELRO-NEXT:   Address: 0x202118
 // FULLRELRO-NEXT:   Offset: 0x2118
 // FULLRELRO-NEXT:   Size: 32
 // FULLRELRO-NEXT:   Link: 0
 // FULLRELRO-NEXT:   Info: 0
 // FULLRELRO-NEXT:   AddressAlignment: 8
 // FULLRELRO-NEXT:   EntrySize: 0
 // FULLRELRO-NEXT:   SectionData (
 // FULLRELRO-NEXT:     0000:
 // FULLRELRO-NEXT:     0010:
 // FULLRELRO-NEXT:   )
 // FULLRELRO-NEXT: }
 // FULLRELRO-NEXT: Section {
 // FULLRELRO-NEXT:   Index: 11
 // FULLRELRO-NEXT:   Name: .data
 // FULLRELRO-NEXT:   Type: SHT_PROGBITS
 // FULLRELRO-NEXT:   Flags [
 // FULLRELRO-NEXT:     SHF_ALLOC
 // FULLRELRO-NEXT:     SHF_WRITE
 // FULLRELRO-NEXT:   ]
-// FULLRELRO-NEXT:   Address: 0x13000
+// FULLRELRO-NEXT:   Address: 0x203000
 // FULLRELRO-NEXT:   Offset: 0x3000
 // FULLRELRO-NEXT:   Size: 12
 // FULLRELRO-NEXT:   Link: 0
 // FULLRELRO-NEXT:   Info: 0
 // FULLRELRO-NEXT:   AddressAlignment:
 // FULLRELRO-NEXT:   EntrySize: 0
 // FULLRELRO-NEXT:   SectionData (
 // FULLRELRO-NEXT:     0000:
 // FULLRELRO-NEXT:   )
 // FULLRELRO-NEXT: }
 // FULLRELRO-NEXT: Section {
 // FULLRELRO-NEXT:   Index: 12
 // FULLRELRO-NEXT:   Name: .foo
 // FULLRELRO-NEXT:   Type: SHT_PROGBITS
 // FULLRELRO-NEXT:   Flags [
 // FULLRELRO-NEXT:     SHF_ALLOC
 // FULLRELRO-NEXT:     SHF_WRITE
 // FULLRELRO-NEXT:   ]
-// FULLRELRO-NEXT:   Address: 0x1300C
+// FULLRELRO-NEXT:   Address: 0x20300C
 // FULLRELRO-NEXT:   Offset: 0x300C
 // FULLRELRO-NEXT:   Size: 0
 // FULLRELRO-NEXT:   Link: 0
 // FULLRELRO-NEXT:   Info: 0
 // FULLRELRO-NEXT:   AddressAlignment:
 // FULLRELRO-NEXT:   EntrySize: 0
 // FULLRELRO-NEXT:   SectionData (
 // FULLRELRO-NEXT:   )

 // PARTRELRO:       Section {
 // PARTRELRO:       Index: 9
 // PARTRELRO-NEXT:  Name: .got
 // PARTRELRO-NEXT:  Type: SHT_PROGBITS
 // PARTRELRO-NEXT:  Flags [
 // PARTRELRO-NEXT:    SHF_ALLOC
 // PARTRELRO-NEXT:    SHF_WRITE
 // PARTRELRO-NEXT:  ]
-// PARTRELRO-NEXT:  Address: 0x120F0
+// PARTRELRO-NEXT:  Address: 0x2020F0
 // PARTRELRO-NEXT:  Offset: 0x20F0
 // PARTRELRO-NEXT:  Size: 8
 // PARTRELRO-NEXT:  Link: 0
 // PARTRELRO-NEXT:  Info: 0
 // PARTRELRO-NEXT:  AddressAlignment: 8
 // PARTRELRO-NEXT:  EntrySize: 0
 // PARTRELRO-NEXT:  SectionData (
 // PARTRELRO-NEXT:    0000:
 // PARTRELRO-NEXT:  )
 // PARTRELRO-NEXT:  }
 // PARTRELRO-NEXT:  Section {
 // PARTRELRO-NEXT:  Index: 10
 // PARTRELRO-NEXT:  Name: .data
 // PARTRELRO-NEXT:  Type: SHT_PROGBITS
 // PARTRELRO-NEXT:  Flags [
 // PARTRELRO-NEXT:    SHF_ALLOC
 // PARTRELRO-NEXT:    SHF_WRITE
 // PARTRELRO-NEXT:  ]
-// PARTRELRO-NEXT:  Address: 0x13000
+// PARTRELRO-NEXT:  Address: 0x203000
 // PARTRELRO-NEXT:  Offset: 0x3000
 // PARTRELRO-NEXT:  Size: 12
 // PARTRELRO-NEXT:  Link: 0
 // PARTRELRO-NEXT:  Info: 0
 // PARTRELRO-NEXT:  AddressAlignment: 1
 // PARTRELRO-NEXT:  EntrySize: 0
 // PARTRELRO-NEXT:  SectionData (
 // PARTRELRO-NEXT:    0000:
 // PARTRELRO-NEXT:  )
 // PARTRELRO-NEXT:  }
 // PARTRELRO-NEXT:  Section {
 // PARTRELRO-NEXT:    Index: 11
 // PARTRELRO-NEXT:    Name: .foo
 // PARTRELRO-NEXT:    Type: SHT_PROGBITS
 // PARTRELRO-NEXT:    Flags [
 // PARTRELRO-NEXT:      SHF_ALLOC
 // PARTRELRO-NEXT:      SHF_WRITE
 // PARTRELRO-NEXT:    ]
-// PARTRELRO-NEXT:    Address: 0x1300C
+// PARTRELRO-NEXT:    Address: 0x20300C
 // PARTRELRO-NEXT:    Offset: 0x300C
 // PARTRELRO-NEXT:    Size: 0
 // PARTRELRO-NEXT:    Link: 0
 // PARTRELRO-NEXT:    Info: 0
 // PARTRELRO-NEXT:    AddressAlignment: 1
 // PARTRELRO-NEXT:    EntrySize: 0
 // PARTRELRO-NEXT:    SectionData (
 // PARTRELRO-NEXT:    )
 // PARTRELRO-NEXT:  }
 // PARTRELRO-NEXT:  Section {
 // PARTRELRO-NEXT:    Index: 12
 // PARTRELRO-NEXT:    Name: .got.plt
 // PARTRELRO-NEXT:    Type: SHT_PROGBITS
 // PARTRELRO-NEXT:    Flags [
 // PARTRELRO-NEXT:      SHF_ALLOC
 // PARTRELRO-NEXT:      SHF_WRITE
 // PARTRELRO-NEXT:    ]
-// PARTRELRO-NEXT:    Address: 0x13010
+// PARTRELRO-NEXT:    Address: 0x203010
 // PARTRELRO-NEXT:    Offset: 0x3010
 // PARTRELRO-NEXT:    Size: 32
 // PARTRELRO-NEXT:    Link: 0
 // PARTRELRO-NEXT:    Info: 0
 // PARTRELRO-NEXT:    AddressAlignment: 8
 // PARTRELRO-NEXT:    EntrySize: 0
 // PARTRELRO-NEXT:    SectionData (
 // PARTRELRO-NEXT:      0000:
 // PARTRELRO-NEXT:      0010:
 // PARTRELRO-NEXT:    )
 // PARTRELRO-NEXT:  }
 // PARTRELRO-NEXT:  Section {
 // PARTRELRO-NEXT:    Index: 13
 // PARTRELRO-NEXT:    Name: .bss
 // PARTRELRO-NEXT:    Type: SHT_NOBITS
 // PARTRELRO-NEXT:    Flags [
 // PARTRELRO-NEXT:      SHF_ALLOC
 // PARTRELRO-NEXT:      SHF_WRITE
 // PARTRELRO-NEXT:    ]
-// PARTRELRO-NEXT:    Address: 0x13030
+// PARTRELRO-NEXT:    Address: 0x203030
 // PARTRELRO-NEXT:    Offset: 0x3030
 // PARTRELRO-NEXT:    Size: 0
 // PARTRELRO-NEXT:    Link: 0
 // PARTRELRO-NEXT:    Info: 0
 // PARTRELRO-NEXT:    AddressAlignment: 1
 // PARTRELRO-NEXT:    EntrySize: 0
 // PARTRELRO-NEXT:  }
 // PARTRELRO:       ProgramHeader {

lld/trunk/test/ELF/resolution.s

 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Weak
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: Undefined
 // CHECK-NEXT:   }
 // CHECK-NEXT:  Symbol {
 // CHECK-NEXT:    Name: _start
-// CHECK-NEXT:    Value: 0x11000
+// CHECK-NEXT:    Value: 0x201000
 // CHECK-NEXT:    Size: 0
 // CHECK-NEXT:    Binding: Global (0x1)
 // CHECK-NEXT:    Type: None (0x0)
 // CHECK-NEXT:    Other: 0
 // CHECK-NEXT:    Section: .text (0x1)
 // CHECK-NEXT:  }
 // CHECK-NEXT: ]
 

lld/trunk/test/ELF/startstop-gccollect.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
 
 ## Default run: sections foo and bar exist in output
 # RUN: ld.lld %t -o %tout
 # RUN: llvm-objdump -d %tout | FileCheck -check-prefix=DISASM %s
 
 ## Check that foo and bar sections are not garbage collected,
 ## we do not want to reclaim sections if they can be referred
 ## by __start_* and __stop_* symbols.
 # RUN: ld.lld %t --gc-sections -o %tout
 # RUN: llvm-objdump -d %tout | FileCheck -check-prefix=DISASM %s
 
 # DISASM:      _start:
-# DISASM-NEXT:    11000:       90      nop
+# DISASM-NEXT:    201000:       90      nop
 # DISASM-NEXT: Disassembly of section foo:
 # DISASM-NEXT: foo:
-# DISASM-NEXT:    11001:       90      nop
+# DISASM-NEXT:    201001:       90      nop
 # DISASM-NEXT: Disassembly of section bar:
 # DISASM-NEXT: bar:
-# DISASM-NEXT:    11002:       90      nop
+# DISASM-NEXT:    201002:       90      nop
 
 .global _start
 .text
 _start:
  nop
 
 .section foo,"ax"
  nop
 
 .section bar,"ax"
  nop

lld/trunk/test/ELF/startstop-shared2.s

 // REQUIRES: x86
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/startstop-shared2.s -o %t.o
 // RUN: ld.lld -o %t.so %t.o -shared
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2.o
 // RUN: ld.lld -o %t %t2.o %t.so
 // RUN: llvm-objdump -s -h %t | FileCheck %s
 
-// CHECK: foo           00000000 0000000000011008
+// CHECK: foo           00000000 0000000000201008
 
 // CHECK: Contents of section .text:
-// CHECK-NEXT: 11000 08100100 00000000
+// CHECK-NEXT: 201000 08102000 00000000
 
 .quad __start_foo
 .section foo,"ax"

lld/trunk/test/ELF/string-gc.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t --gc-sections
 // RUN: llvm-readobj -symbols %t | FileCheck %s
 
 // CHECK:      Symbols [
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name:  (0)
 // CHECK-NEXT:     Value: 0x0
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local (0x0)
 // CHECK-NEXT:     Type: None (0x0)
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: Undefined (0x0)
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: s3
-// CHECK-NEXT:     Value: 0x10125
+// CHECK-NEXT:     Value: 0x200125
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local (0x0)
 // CHECK-NEXT:     Type: Object (0x1)
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: .rodata (0x1)
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: s1
-// CHECK-NEXT:     Value: 0x10120
+// CHECK-NEXT:     Value: 0x200120
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local (0x0)
 // CHECK-NEXT:     Type: Object (0x1)
 // CHECK-NEXT:     Other [ (0x2)
 // CHECK-NEXT:       STV_HIDDEN (0x2)
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Section: .rodata (0x1)
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: _start
-// CHECK-NEXT:     Value: 0x11000
+// CHECK-NEXT:     Value: 0x201000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global (0x1)
 // CHECK-NEXT:     Type: Function (0x2)
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: .text (0x2)
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 

lld/trunk/test/ELF/string-table.s

 .section bar, "a"
 
 // Both sections are in the output and that the alloc section is first:
 // CHECK:      Name: bar
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:  SHF_ALLOC
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x10120
+// CHECK-NEXT: Address: 0x200120
 
 // CHECK:      Name: foobar
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT: ]
 // CHECK-NEXT: Address: 0x0
 
 // CHECK:      Name: foobar

lld/trunk/test/ELF/symbol-ordering-file.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o -o %t.out
 # RUN: llvm-objdump -s %t.out| FileCheck %s --check-prefix=BEFORE
 
 # BEFORE:      Contents of section .foo:
-# BEFORE-NEXT:  11000 11223344 5566
+# BEFORE-NEXT:  201000 11223344 5566
 
 # RUN: echo "_foo4  " > %t_order.txt
 # RUN: echo "  _foo3" >> %t_order.txt
 # RUN: echo "_foo5" >> %t_order.txt
 # RUN: echo "_foo2" >> %t_order.txt
 # RUN: echo " " >> %t_order.txt
 # RUN: echo "_foo4" >> %t_order.txt
 # RUN: echo "_bar1" >> %t_order.txt
 # RUN: echo "_foo1" >> %t_order.txt
 
 # RUN: ld.lld --symbol-ordering-file %t_order.txt %t.o -o %t2.out
 # RUN: llvm-objdump -s %t2.out| FileCheck %s --check-prefix=AFTER
 
 # AFTER:      Contents of section .foo:
-# AFTER-NEXT:  11000 44335566 2211
+# AFTER-NEXT:  201000 44335566 2211
 
 .section .foo,"ax",@progbits,unique,1
 _foo1:
  .byte 0x11
 
 .section .foo,"ax",@progbits,unique,2
 _foo2:
  .byte 0x22

lld/trunk/test/ELF/symbol-override.s

 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: Function
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: Undefined
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: foo
-// CHECK-NEXT:     Value: 0x11000
+// CHECK-NEXT:     Value: 0x201000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: Function
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: .text
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]
 

lld/trunk/test/ELF/symbols.s

 .internal internal
 internal:
 
 // CHECK:      Name: foobar
 // CHECK-NEXT: Type: SHT_NOBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x10158
+// CHECK-NEXT: Address: 0x200158
 
 // CHECK:      Name: .text
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_EXECINSTR
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x1100
+// CHECK-NEXT: Address: 0x201000
 
 // CHECK:      Name: .bss
 // CHECK-NEXT: Type: SHT_NOBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x12000
+// CHECK-NEXT: Address: 0x202000
 // CHECK-NEXT: Offset:
 // CHECK-NEXT: Size: 4
 
 // CHECK:      Symbols [
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name:  (0)
 // CHECK-NEXT:     Value: 0x0
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local (0x0)
 // CHECK-NEXT:     Type: None (0x0)
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: Undefined (0x0)
 // CHECK-NEXT:   }
 // CHECK-NEXT: Symbol {
 // CHECK-NEXT:     Name: hidden
-// CHECK-NEXT:     Value: 0x10160
+// CHECK-NEXT:     Value: 0x200160
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other [ (0x2)
 // CHECK-NEXT:       STV_HIDDEN
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Section: foobar
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: internal
-// CHECK-NEXT:     Value: 0x10160
+// CHECK-NEXT:     Value: 0x200160
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Local
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other [ (0x1)
 // CHECK-NEXT:       STV_INTERNAL
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Section: foobar
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: _start
-// CHECK-NEXT:     Value: 0x11000
+// CHECK-NEXT:     Value: 0x201000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global (0x1)
 // CHECK-NEXT:     Type: Function
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: .text
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: abs

 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Weak (0x2)
 // CHECK-NEXT:     Type: Object (0x1)
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: Undefined (0x0)
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: common
-// CHECK-NEXT:     Value: 0x12000
+// CHECK-NEXT:     Value: 0x202000
 // CHECK-NEXT:     Size: 4
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: Object
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: .bss
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: foo
-// CHECK-NEXT:     Value: 0x11000
+// CHECK-NEXT:     Value: 0x201000
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Weak (0x2)
 // CHECK-NEXT:     Type: Object
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: .text
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: protected
-// CHECK-NEXT:     Value: 0x10160
+// CHECK-NEXT:     Value: 0x200160
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other [ (0x3)
 // CHECK-NEXT:       STV_PROTECTED
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Section: foobar
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: zed
-// CHECK-NEXT:     Value: 0x10158
+// CHECK-NEXT:     Value: 0x200158
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global (0x1)
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: foobar
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: zed2
-// CHECK-NEXT:     Value: 0x1015C
+// CHECK-NEXT:     Value: 0x20015C
 // CHECK-NEXT:     Size: 0
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: foobar
 // CHECK-NEXT:   }
 // CHECK-NEXT:   Symbol {
 // CHECK-NEXT:     Name: zed3
-// CHECK-NEXT:     Value: 0x10160
+// CHECK-NEXT:     Value: 0x200160
 // CHECK-NEXT:     Size: 4
 // CHECK-NEXT:     Binding: Global
 // CHECK-NEXT:     Type: None
 // CHECK-NEXT:     Other: 0
 // CHECK-NEXT:     Section: foobar
 // CHECK-NEXT:   }
 // CHECK-NEXT: ]

lld/trunk/test/ELF/tls-got.s

 // CHECK-NEXT: Link: 0
 // CHECK-NEXT: Info: 0
 // CHECK-NEXT: AddressAlignment: 8
 // CHECK-NEXT: EntrySize: 0
 // CHECK-NEXT: }
 
 // CHECK:      Relocations [
 // CHECK-NEXT:   Section (4) .rela.dyn {
-// CHECK-NEXT:     0x120B8 R_X86_64_TPOFF64 tls0 0x0
+// CHECK-NEXT:     0x2020B8 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
+//0x201000 + 4249 + 7 = 0x2020B0
+//0x20100A + 4247 + 7 = 0x2020B8
+//0x201014 + 4237 + 7 = 0x2020B8
 //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: 201000: 48 8b 05 a9 10 00 00 movq 4265(%rip), %rax
+//DISASM-NEXT: 201007: 64 8b 00 movl %fs:(%rax), %eax
+//DISASM-NEXT: 20100a: 48 8b 05 a7 10 00 00 movq 4263(%rip), %rax
+//DISASM-NEXT: 201011: 64 8b 00 movl %fs:(%rax), %eax
+//DISASM-NEXT: 201014: 48 8b 05 9d 10 00 00 movq 4253(%rip), %rax
+//DISASM-NEXT: 20101b: 64 8b 00 movl %fs:(%rax), %eax
+//DISASM-NEXT: 20101e: c3 retq
 
 .section .tdata,"awT",@progbits
 
 .text
  .globl main
  .align 16, 0x90
  .type main,@function
 main:
  movq tls1@GOTTPOFF(%rip), %rax
  movl %fs:0(%rax), %eax
  movq tls0@GOTTPOFF(%rip), %rax
  movl %fs:0(%rax), %eax
  movq tls0@GOTTPOFF(%rip), %rax
  movl %fs:0(%rax), %eax
  ret

lld/trunk/test/ELF/tls-offset.s

 
 // CHECK:      Name: .tdata
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_TLS
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x12000
+// CHECK-NEXT: Address: 0x202000
 // CHECK-NEXT: Offset: 0x2000
 // CHECK-NEXT: Size: 4
 
 // CHECK:      Name: .tbss
 // CHECK-NEXT: Type: SHT_NOBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_TLS
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x12010
+// CHECK-NEXT: Address: 0x202010
 // CHECK-NEXT: Offset: 0x2004
 // CHECK-NEXT: Size: 16
 
 // CHECK:      Name: .data
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_WRITE
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x12004
+// CHECK-NEXT: Address: 0x202004
 // CHECK-NEXT: Offset: 0x2004
 // CHECK-NEXT: Size: 4

lld/trunk/test/ELF/tls-opt-gdie.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/tls-opt-gdie.s -o %tso.o
 // RUN: ld.lld -shared %tso.o -o %t.so
 // RUN: ld.lld %t.o %t.so -o %t1
 // RUN: llvm-readobj -s -r %t1 | FileCheck --check-prefix=RELOC %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 //RELOC:      Section {
 //RELOC:      Index:
 //RELOC:      Name: .got
 //RELOC-NEXT: Type: SHT_PROGBITS
 //RELOC-NEXT: Flags [
 //RELOC-NEXT:   SHF_ALLOC
 //RELOC-NEXT:   SHF_WRITE
 //RELOC-NEXT: ]
-//RELOC-NEXT: Address: 0x120B0
+//RELOC-NEXT: Address: 0x2020B0
 //RELOC-NEXT: Offset: 0x20B0
 //RELOC-NEXT: Size: 16
 //RELOC-NEXT: Link: 0
 //RELOC-NEXT: Info: 0
 //RELOC-NEXT: AddressAlignment: 8
 //RELOC-NEXT: EntrySize: 0
 //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:     0x2020B0 R_X86_64_TPOFF64 tlsshared0 0x0
+//RELOC-NEXT:     0x2020B8 R_X86_64_TPOFF64 tlsshared1 0x0
 //RELOC-NEXT:   }
 //RELOC-NEXT: ]
 
-//0x11009 + (4256 + 7) = 0x120B0
-//0x11019 + (4248 + 7) = 0x120B8
+//0x201009 + (4256 + 7) = 0x2020B0
+//0x201019 + (4248 + 7) = 0x2020B8
 // 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: 201000: {{.*}} movq %fs:0, %rax
+// DISASM-NEXT: 201009: {{.*}} addq 4256(%rip), %rax
+// DISASM-NEXT: 201010: {{.*}} movq %fs:0, %rax
+// DISASM-NEXT: 201019: {{.*}} addq 4248(%rip), %rax
 
 .section .text
 .globl _start
 _start:
  .byte 0x66
  leaq tlsshared0@tlsgd(%rip),%rdi
  .word 0x6666
  rex64
  call __tls_get_addr@plt
  .byte 0x66
  leaq tlsshared1@tlsgd(%rip),%rdi
  .word 0x6666
  rex64
  call __tls_get_addr@plt

lld/trunk/test/ELF/tls-opt-local.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t1
 // RUN: llvm-readobj -r %t1 | FileCheck --check-prefix=NORELOC %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 // NORELOC:      Relocations [
 // NORELOC-NEXT: ]
 
 // 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: 201000: 48 c7 c0 f8 ff ff ff movq $-8, %rax
+// DISASM-NEXT: 201007: 49 c7 c7 f8 ff ff ff movq $-8, %r15
+// DISASM-NEXT: 20100e: 48 8d 80 f8 ff ff ff leaq -8(%rax), %rax
+// DISASM-NEXT: 201015: 4d 8d bf f8 ff ff ff leaq -8(%r15), %r15
+// DISASM-NEXT: 20101c: 48 81 c4 f8 ff ff ff addq $-8, %rsp
+// DISASM-NEXT: 201023: 49 81 c4 f8 ff ff ff addq $-8, %r12
+// DISASM-NEXT: 20102a: 48 c7 c0 fc ff ff ff movq $-4, %rax
+// DISASM-NEXT: 201031: 49 c7 c7 fc ff ff ff movq $-4, %r15
+// DISASM-NEXT: 201038: 48 8d 80 fc ff ff ff leaq -4(%rax), %rax
+// DISASM-NEXT: 20103f: 4d 8d bf fc ff ff ff leaq -4(%r15), %r15
+// DISASM-NEXT: 201046: 48 81 c4 fc ff ff ff addq $-4, %rsp
+// DISASM-NEXT: 20104d: 49 81 c4 fc ff ff ff addq $-4, %r12
 
 .section .tbss,"awT",@nobits
 
 .type tls0,@object
 .align 4
 tls0:
  .long 0
  .size tls0, 4

lld/trunk/test/ELF/tls-opt.s

 // RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
 // RUN: ld.lld %t.o -o %t1
 // RUN: llvm-readobj -r %t1 | FileCheck --check-prefix=NORELOC %s
 // RUN: llvm-objdump -d %t1 | FileCheck --check-prefix=DISASM %s
 
 // NORELOC:      Relocations [
 // 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: 201000: 48 c7 c0 f8 ff ff ff  movq $-8, %rax
+// DISASM-NEXT: 201007: 49 c7 c7 f8 ff ff ff  movq $-8, %r15
+// DISASM-NEXT: 20100e: 48 8d 80 f8 ff ff ff  leaq -8(%rax), %rax
+// DISASM-NEXT: 201015: 4d 8d bf f8 ff ff ff  leaq -8(%r15), %r15
+// DISASM-NEXT: 20101c: 48 81 c4 f8 ff ff ff  addq $-8, %rsp
+// DISASM-NEXT: 201023: 49 81 c4 f8 ff ff ff  addq $-8, %r12
+// DISASM-NEXT: 20102a: 48 c7 c0 fc ff ff ff  movq $-4, %rax
+// DISASM-NEXT: 201031: 49 c7 c7 fc ff ff ff  movq $-4, %r15
+// DISASM-NEXT: 201038: 48 8d 80 fc ff ff ff  leaq -4(%rax), %rax
+// DISASM-NEXT: 20103f: 4d 8d bf fc ff ff ff  leaq -4(%r15), %r15
+// DISASM-NEXT: 201046: 48 81 c4 fc ff ff ff  addq $-4, %rsp
+// DISASM-NEXT: 20104d: 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: 201054: 66 66 66 64 48 8b 04 25 00 00 00 00  movq %fs:0, %rax
+// DISASM-NEXT: 201060: 48 8d 88 f8 ff ff ff                 leaq -8(%rax), %rcx
+// DISASM-NEXT: 201067: 66 66 66 64 48 8b 04 25 00 00 00 00  movq %fs:0, %rax
+// DISASM-NEXT: 201073: 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: 20107a: 64 48 8b 04 25 00 00 00 00  movq %fs:0, %rax
+// DISASM-NEXT: 201083: 48 8d 80 f8 ff ff ff        leaq -8(%rax), %rax
+// DISASM-NEXT: 20108a: 64 48 8b 04 25 00 00 00 00  movq %fs:0, %rax
+// DISASM-NEXT: 201093: 48 8d 80 fc ff ff ff        leaq -4(%rax), %rax
 
 // LD to LE:
 // DISASM:     _DTPOFF64_1:
-// DISASM-NEXT: 1109a: f8 clc
+// DISASM-NEXT: 20109a: f8 clc
 // DISASM:      _DTPOFF64_2:
-// DISASM-NEXT: 110a3: fc cld
+// DISASM-NEXT: 2010a3: fc cld
 
 .type tls0,@object
 .section .tbss,"awT",@nobits
 .globl tls0
 .align 4
 tls0:
  .long 0
  .size tls0, 4

lld/trunk/test/ELF/tls.s

 // CHECK-NEXT:     Name: .thread_bss
 // CHECK-NEXT:     Type: SHT_NOBITS
 // CHECK-NEXT:     Flags [
 // CHECK-NEXT:       SHF_ALLOC
 // CHECK-NEXT:       SHF_TLS
 // CHECK-NEXT:       SHF_WRITE
 // CHECK-NEXT:     ]
 
-// 0x1200C = TBSS_ADDR + 4
+// 0x20200C = TBSS_ADDR + 4
 
-// CHECK-NEXT:     Address: 0x1200C
+// CHECK-NEXT:     Address: 0x20200C
 // CHECK-NEXT:     Offset:
 // CHECK-NEXT:     Size: 4
 // CHECK-NEXT:     Link:
 // CHECK-NEXT:     Info:
 // CHECK-NEXT:     AddressAlignment:
 // CHECK-NEXT:     EntrySize:
 // CHECK-NEXT:   }
 

 // CHECK-NEXT:     Flags [
 // CHECK-NEXT:       PF_R
 // CHECK-NEXT:     ]
 // CHECK-NEXT:     Alignment:
 // CHECK-NEXT:   }
 
 // 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:    201000: {{.+}} movl    %fs:-8, %eax
+// DIS-NEXT:    201008: {{.+}} movl    %fs:-16, %eax
+// DIS-NEXT:    201010: {{.+}} movl    %fs:-4, %eax
+// DIS-NEXT:    201018: {{.+}} movl    %fs:-12, %eax

lld/trunk/test/ELF/undef-with-plt-addr.s

 // Test that set_data has an address in the .plt, but foo is not
 
 // CHECK:      Name: .plt
 // CHECK-NEXT: Type: SHT_PROGBITS
 // CHECK-NEXT: Flags [
 // CHECK-NEXT:   SHF_ALLOC
 // CHECK-NEXT:   SHF_EXECINSTR
 // CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x11010
+// CHECK-NEXT: Address: 0x201010
 
 // CHECK:      Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT:   0x13000 R_X86_64_64 foo 0x0
+// CHECK-NEXT:   0x203000 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:   0x203020 R_X86_64_JUMP_SLOT set_data 0x0
 // CHECK-NEXT: }
 
 // CHECK:      Name: foo
 // CHECK-NEXT: Value: 0x0
 // CHECK-NEXT: Size: 0
 // CHECK-NEXT: Binding: Global
 // CHECK-NEXT: Type: Function
 // CHECK-NEXT: Other: 0
 // CHECK-NEXT: Section: Undefined
 
 // CHECK:      Name:    set_data
-// CHECK-NEXT: Value:   0x11020
+// CHECK-NEXT: Value:   0x201020
 // CHECK-NEXT: Size: 0
 // CHECK-NEXT: Binding: Global
 // CHECK-NEXT: Type: Function
 // CHECK-NEXT: Other: 0
 // CHECK-NEXT: Section: Undefined

lld/trunk/test/ELF/verdef-defaultver.s

 # EXE-NEXT:      Size: 0
 # EXE-NEXT:      Binding: Local
 # EXE-NEXT:      Type: None
 # EXE-NEXT:      Other: 0
 # EXE-NEXT:      Section: Undefined
 # EXE-NEXT:    }
 # EXE-NEXT:    Symbol {
 # EXE-NEXT:      Name: a@V1
-# EXE-NEXT:      Value: 0x11020
+# EXE-NEXT:      Value: 0x201020
 # EXE-NEXT:      Size: 0
 # EXE-NEXT:      Binding: Global
 # EXE-NEXT:      Type: Function
 # EXE-NEXT:      Other: 0
 # EXE-NEXT:      Section: Undefined
 # EXE-NEXT:    }
 # EXE-NEXT:    Symbol {
 # EXE-NEXT:      Name: b@V2
-# EXE-NEXT:      Value: 0x11030
+# EXE-NEXT:      Value: 0x201030
 # EXE-NEXT:      Size: 0
 # EXE-NEXT:      Binding: Global
 # EXE-NEXT:      Type: Function
 # EXE-NEXT:      Other: 0
 # EXE-NEXT:      Section: Undefined
 # EXE-NEXT:    }
 # EXE-NEXT:    Symbol {
 # EXE-NEXT:      Name: c@V2
-# EXE-NEXT:      Value: 0x11040
+# EXE-NEXT:      Value: 0x201040
 # EXE-NEXT:      Size: 0
 # EXE-NEXT:      Binding: Global
 # EXE-NEXT:      Type: Function
 # EXE-NEXT:      Other: 0
 # EXE-NEXT:      Section: Undefined
 # EXE-NEXT:    }
 # EXE-NEXT:  ]
 # EXE-NEXT:  Version symbols {
 # EXE-NEXT:    Section Name: .gnu.version
-# EXE-NEXT:    Address: 0x10228
+# EXE-NEXT:    Address: 0x200228
 # EXE-NEXT:    Offset: 0x228
 # EXE-NEXT:    Link: 1
 # EXE-NEXT:    Symbols [
 # EXE-NEXT:      Symbol {
 # EXE-NEXT:        Version: 0
 # EXE-NEXT:        Name: @
 # EXE-NEXT:      }
 # EXE-NEXT:      Symbol {

lld/trunk/test/ELF/verdef.s

 
 ## Check that we can link agains DSO we produced.
 # RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %S/Inputs/verdef.s -o %tmain.o
 # RUN: ld.lld %tmain.o %t.so -o %tout
 # RUN: llvm-readobj -V %tout | FileCheck --check-prefix=MAIN %s
 
 # MAIN:      Version symbols {
 # MAIN-NEXT:   Section Name: .gnu.version
-# MAIN-NEXT:   Address: 0x10228
+# MAIN-NEXT:   Address: 0x200228
 # MAIN-NEXT:   Offset: 0x228
 # MAIN-NEXT:   Link: 1
 # MAIN-NEXT:   Symbols [
 # MAIN-NEXT:     Symbol {
 # MAIN-NEXT:       Version: 0
 # MAIN-NEXT:       Name: @
 # MAIN-NEXT:     }
 # MAIN-NEXT:     Symbol {

lld/trunk/test/ELF/verneed.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
 # RUN: ld.lld %t.o %S/Inputs/verneed1.so %S/Inputs/verneed2.so -o %t
 # RUN: llvm-readobj -V -sections -section-data -dyn-symbols -dynamic-table %t | FileCheck %s
 
 # CHECK:        Section {
 # CHECK:         Index: 1
 # CHECK-NEXT:    Name: .dynsym
 # CHECK-NEXT:    Type: SHT_DYNSYM (0xB)
 # CHECK-NEXT:    Flags [ (0x2)
 # CHECK-NEXT:      SHF_ALLOC (0x2)
 # CHECK-NEXT:    ]
-# CHECK-NEXT:    Address: 0x101C8
+# CHECK-NEXT:    Address: 0x2001C8
 # CHECK-NEXT:    Offset: 0x1C8
 # CHECK-NEXT:    Size: 96
 # CHECK-NEXT:    Link: 5
 # CHECK-NEXT:    Info: 1
 # CHECK-NEXT:    AddressAlignment: 8
 # CHECK-NEXT:    EntrySize: 24
 # CHECK:       Section {
 # CHECK-NEXT:   Index: 2
 # CHECK-NEXT:   Name: .gnu.version
 # CHECK-NEXT:   Type: SHT_GNU_versym (0x6FFFFFFF)
 # CHECK-NEXT:   Flags [ (0x2)
 # CHECK-NEXT:     SHF_ALLOC (0x2)
 # CHECK-NEXT:   ]
-# CHECK-NEXT:   Address: 0x10228
+# CHECK-NEXT:   Address: 0x200228
 # CHECK-NEXT:   Offset: 0x228
 # CHECK-NEXT:   Size: 8
 # CHECK-NEXT:   Link: 1
 # CHECK-NEXT:   Info: 0
 # CHECK-NEXT:   AddressAlignment: 2
 # CHECK-NEXT:   EntrySize: 2
 # CHECK:       Section {
 # CHECK-NEXT:   Index: 3
 # CHECK-NEXT:   Name: .gnu.version_r
 # CHECK-NEXT:   Type: SHT_GNU_verneed (0x6FFFFFFE)
 # CHECK-NEXT:   Flags [ (0x2)
 # CHECK-NEXT:     SHF_ALLOC (0x2)
 # CHECK-NEXT:   ]
-# CHECK-NEXT:   Address: 0x10230
+# CHECK-NEXT:   Address: 0x200230
 # CHECK-NEXT:   Offset: 0x230
 # CHECK-NEXT:   Size: 80
 # CHECK-NEXT:   Link: 5
 # CHECK-NEXT:   Info: 2
 # CHECK-NEXT:   AddressAlignment: 4
 # CHECK-NEXT:   EntrySize: 0
 # CHECK:      Section {
 # CHECK:        Index: 5
 # CHECK-NEXT:   Name: .dynstr
 # CHECK-NEXT:   Type: SHT_STRTAB
 # CHECK-NEXT:   Flags [ (0x2)
 # CHECK-NEXT:     SHF_ALLOC (0x2)
 # CHECK-NEXT:   ]
-# CHECK-NEXT:   Address: 0x102A8
+# CHECK-NEXT:   Address: 0x2002A8
 # CHECK-NEXT:   Offset: 0x2A8
 # CHECK-NEXT:   Size: 47
 # CHECK-NEXT:   Link: 0
 # CHECK-NEXT:   Info: 0
 # CHECK-NEXT:   AddressAlignment: 1
 # CHECK-NEXT:   EntrySize: 0
 # CHECK-NEXT:   SectionData (
 # CHECK-NEXT:     0000: 00766572 6E656564 312E736F 2E300076  |.verneed1.so.0.v|

 # CHECK-NEXT:     Size: 0
 # CHECK-NEXT:     Binding: Global (0x1)
 # CHECK-NEXT:     Type: None (0x0)
 # CHECK-NEXT:     Other: 0
 # CHECK-NEXT:     Section: Undefined (0x0)
 # CHECK-NEXT:   }
 # CHECK-NEXT: ]
 
-# CHECK:      0x000000006FFFFFF0 VERSYM               0x10228
-# CHECK-NEXT: 0x000000006FFFFFFE VERNEED              0x10230
+# CHECK:      0x000000006FFFFFF0 VERSYM               0x200228
+# CHECK-NEXT: 0x000000006FFFFFFE VERNEED              0x200230
 # CHECK-NEXT: 0x000000006FFFFFFF VERNEEDNUM           2
 
 # CHECK:      Version symbols {
 # CHECK-NEXT:    Section Name: .gnu.version
-# CHECK-NEXT:    Address: 0x10228
+# CHECK-NEXT:    Address: 0x200228
 # CHECK-NEXT:    Offset: 0x228
 # CHECK-NEXT:    Link: 1
 # CHECK-NEXT:    Symbols [
 # CHECK-NEXT:      Symbol {
 # CHECK-NEXT:        Version: 0
 # CHECK-NEXT:        Name: @
 # CHECK-NEXT:      }
 # CHECK-NEXT:      Symbol {

lld/trunk/test/ELF/version-script.s

 # EXE-NEXT:     Size: 0
 # EXE-NEXT:     Binding: Global (0x1)
 # EXE-NEXT:     Type: Function (0x2)
 # EXE-NEXT:     Other: 0
 # EXE-NEXT:     Section: Undefined (0x0)
 # EXE-NEXT:   }
 # EXE-NEXT:   Symbol {
 # EXE-NEXT:     Name: foo1@
-# EXE-NEXT:     Value: 0x11000
+# EXE-NEXT:     Value: 0x201000
 # EXE-NEXT:     Size: 0
 # EXE-NEXT:     Binding: Global (0x1)
 # EXE-NEXT:     Type: None (0x0)
 # EXE-NEXT:     Other: 0
 # EXE-NEXT:     Section: .text
 # EXE-NEXT:   }
 # EXE-NEXT: ]
 

lld/trunk/test/ELF/weak-undef-shared.s

 // REQUIRES: x86
 // RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: llvm-mc %p/Inputs/shared.s -o %t2.o -filetype=obj -triple=x86_64-pc-linux
 // RUN: ld.lld %t2.o -o %t2.so -shared
 // RUN: ld.lld %t.o %t2.so -o %t.exe
 // RUN: llvm-readobj -t %t.exe | FileCheck %s
 
 // CHECK:      Name: bar
-// CHECK-NEXT: Value: 0x11020
+// CHECK-NEXT: Value: 0x201020
 // CHECK-NEXT: Size: 0
 // CHECK-NEXT: Binding: Weak
 // CHECK-NEXT: Type: Function
 // CHECK-NEXT: Other: 0
 // CHECK-NEXT: Section: Undefined
 
 .global _start
 _start:
         .weak bar
         .quad bar