<div dir="ltr">Maybe you forgot to include a test fix for MIPS? If you can't fix this soon, roll it back first and then try again. Thanks!</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Oct 8, 2015 at 12:44 PM, Hal Finkel <span dir="ltr"><<a href="mailto:hfinkel@anl.gov" target="_blank">hfinkel@anl.gov</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Checking...<br>
<br>
 -Hal<br>
<div class="HOEnZb"><div class="h5"><br>
----- Original Message -----<br>
> From: "Rui Ueyama" <<a href="mailto:ruiu@google.com">ruiu@google.com</a>><br>
> To: "Hal Finkel" <<a href="mailto:hfinkel@anl.gov">hfinkel@anl.gov</a>><br>
> Cc: "llvm-commits" <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>><br>
> Sent: Thursday, October 8, 2015 2:42:05 PM<br>
> Subject: Re: [lld] r249723 - [ELF2] Make VAStart a target-dependent property<br>
><br>
><br>
> Looks like it's failing with this error.<br>
><br>
><br>
> /ssd/llvm/tools/lld/test/elf2/emulation.s:143:14: error: expected<br>
> string not found in input<br>
> # MIPS-NEXT: Entry: 0x11030<br>
>              ^<br>
> <stdin>:20:2: note: scanning from here<br>
>  Entry: 0x401030<br>
>  ^<br>
><br>
><br>
> On Thu, Oct 8, 2015 at 12:36 PM, Hal Finkel via llvm-commits <<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a> > wrote:<br>
><br>
><br>
> Author: hfinkel<br>
> Date: Thu Oct 8 14:36:39 2015<br>
> New Revision: 249723<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=249723&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=249723&view=rev</a><br>
> Log:<br>
> [ELF2] Make VAStart a target-dependent property<br>
><br>
> Address a FIXME in ELF/Writer.cpp: Make VAStart a target-dependent<br>
> property.<br>
> I've set the values for the existing targets to what I believe to be<br>
> the<br>
> correct values, and updated the regression tests accordingly.<br>
><br>
> Modified:<br>
> lld/trunk/ELF/Target.cpp<br>
> lld/trunk/ELF/Target.h<br>
> lld/trunk/ELF/Writer.cpp<br>
> lld/trunk/test/elf2/aarch64-relocs.s<br>
> lld/trunk/test/elf2/basic-aarch64.s<br>
> lld/trunk/test/elf2/basic-mips.s<br>
> lld/trunk/test/elf2/basic32be.s<br>
> lld/trunk/test/elf2/basic64be.s<br>
> lld/trunk/test/elf2/emulation.s<br>
><br>
> Modified: lld/trunk/ELF/Target.cpp<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=249723&r1=249722&r2=249723&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=249723&r1=249722&r2=249723&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/ELF/Target.cpp (original)<br>
> +++ lld/trunk/ELF/Target.cpp Thu Oct 8 14:36:39 2015<br>
> @@ -36,6 +36,7 @@ X86TargetInfo::X86TargetInfo() {<br>
> PCRelReloc = R_386_PC32;<br>
> GotReloc = R_386_GLOB_DAT;<br>
> GotRefReloc = R_386_GOT32;<br>
> + VAStart = 0x10000;<br>
> }<br>
><br>
> void X86TargetInfo::writePltEntry(uint8_t *Buf, uint64_t<br>
> GotEntryAddr,<br>
> @@ -91,6 +92,14 @@ X86_64TargetInfo::X86_64TargetInfo() {<br>
> GotReloc = R_X86_64_GLOB_DAT;<br>
> GotRefReloc = R_X86_64_PC32;<br>
> RelativeReloc = R_X86_64_RELATIVE;<br>
> +<br>
> + // On freebsd x86_64 the first page cannot be mmaped.<br>
> + // On linux that is controled by vm.mmap_min_addr. At least on some<br>
> x86_64<br>
> + // installs that is 65536, so the first 15 pages cannot be used.<br>
> + // Given that, the smallest value that can be used in here is<br>
> 0x10000.<br>
> + // If using 2MB pages, the smallest page aligned address that works<br>
> is<br>
> + // 0x200000, but it looks like every OS uses 4k pages for<br>
> executables.<br>
> + VAStart = 0x10000;<br>
> }<br>
><br>
> void X86_64TargetInfo::writePltEntry(uint8_t *Buf, uint64_t<br>
> GotEntryAddr,<br>
> @@ -192,6 +201,7 @@ void X86_64TargetInfo::relocateOne(uint8<br>
> PPC64TargetInfo::PPC64TargetInfo() {<br>
> // PCRelReloc = FIXME<br>
> // GotReloc = FIXME<br>
> + VAStart = 0x10000000;<br>
> }<br>
> void PPC64TargetInfo::writePltEntry(uint8_t *Buf, uint64_t<br>
> GotEntryAddr,<br>
> uint64_t PltEntryAddr) const {}<br>
> @@ -225,6 +235,7 @@ void PPC64TargetInfo::relocateOne(uint8_<br>
> PPCTargetInfo::PPCTargetInfo() {<br>
> // PCRelReloc = FIXME<br>
> // GotReloc = FIXME<br>
> + VAStart = 0x10000000;<br>
> }<br>
> void PPCTargetInfo::writePltEntry(uint8_t *Buf, uint64_t<br>
> GotEntryAddr,<br>
> uint64_t PltEntryAddr) const {}<br>
> @@ -241,6 +252,7 @@ void PPCTargetInfo::relocateOne(uint8_t<br>
> ARMTargetInfo::ARMTargetInfo() {<br>
> // PCRelReloc = FIXME<br>
> // GotReloc = FIXME<br>
> + VAStart = 0x8000;<br>
> }<br>
> void ARMTargetInfo::writePltEntry(uint8_t *Buf, uint64_t<br>
> GotEntryAddr,<br>
> uint64_t PltEntryAddr) const {}<br>
> @@ -257,6 +269,7 @@ void ARMTargetInfo::relocateOne(uint8_t<br>
> AArch64TargetInfo::AArch64TargetInfo() {<br>
> // PCRelReloc = FIXME<br>
> // GotReloc = FIXME<br>
> + VAStart = 0x400000;<br>
> }<br>
> void AArch64TargetInfo::writePltEntry(uint8_t *Buf, uint64_t<br>
> GotEntryAddr,<br>
> uint64_t PltEntryAddr) const {}<br>
> @@ -336,6 +349,7 @@ MipsTargetInfo::MipsTargetInfo() {<br>
> // PCRelReloc = FIXME<br>
> // GotReloc = FIXME<br>
> DefaultEntry = "__start";<br>
> + VAStart = 0x400000;<br>
> }<br>
><br>
> void MipsTargetInfo::writePltEntry(uint8_t *Buf, uint64_t<br>
> GotEntryAddr,<br>
><br>
> Modified: lld/trunk/ELF/Target.h<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.h?rev=249723&r1=249722&r2=249723&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.h?rev=249723&r1=249722&r2=249723&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/ELF/Target.h (original)<br>
> +++ lld/trunk/ELF/Target.h Thu Oct 8 14:36:39 2015<br>
> @@ -21,6 +21,7 @@ class SymbolBody;<br>
> class TargetInfo {<br>
> public:<br>
> llvm::StringRef getDefaultEntry() const { return DefaultEntry; }<br>
> + uint64_t getVAStart() const { return VAStart; }<br>
> unsigned getPCRelReloc() const { return PCRelReloc; }<br>
> unsigned getGotReloc() const { return GotReloc; }<br>
> unsigned getGotRefReloc() const { return GotRefReloc; }<br>
> @@ -38,6 +39,7 @@ public:<br>
> virtual ~TargetInfo();<br>
><br>
> protected:<br>
> + uint64_t VAStart;<br>
> unsigned PCRelReloc;<br>
> unsigned GotRefReloc;<br>
> unsigned GotReloc;<br>
><br>
> Modified: lld/trunk/ELF/Writer.cpp<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=249723&r1=249722&r2=249723&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=249723&r1=249722&r2=249723&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/ELF/Writer.cpp (original)<br>
> +++ lld/trunk/ELF/Writer.cpp Thu Oct 8 14:36:39 2015<br>
> @@ -24,15 +24,6 @@ using namespace lld::elf2;<br>
><br>
> static const int PageSize = 4096;<br>
><br>
> -// On freebsd x86_64 the first page cannot be mmaped.<br>
> -// On linux that is controled by vm.mmap_min_addr. At least on some<br>
> x86_64<br>
> -// installs that is 65536, so the first 15 pages cannot be used.<br>
> -// Given that, the smallest value that can be used in here is<br>
> 0x10000.<br>
> -// If using 2MB pages, the smallest page aligned address that works<br>
> is<br>
> -// 0x200000, but it looks like every OS uses 4k pages for<br>
> executables.<br>
> -// FIXME: This is architecture and OS dependent.<br>
> -static const int VAStart = 0x10000;<br>
> -<br>
> namespace {<br>
><br>
> static uint32_t toPHDRFlags(uint64_t Flags) {<br>
> @@ -102,7 +93,7 @@ private:<br>
> return !Symtab.getSharedFiles().empty() || Config->Shared;<br>
> }<br>
> bool needsDynamicSections() const { return isOutputDynamic(); }<br>
> - unsigned getVAStart() const { return Config->Shared ? 0 : VAStart;<br>
> }<br>
> + unsigned getVAStart() const { return Config->Shared ? 0 :<br>
> Target->getVAStart(); }<br>
><br>
> std::unique_ptr<llvm::FileOutputBuffer> Buffer;<br>
><br>
><br>
> Modified: lld/trunk/test/elf2/aarch64-relocs.s<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/aarch64-relocs.s?rev=249723&r1=249722&r2=249723&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/aarch64-relocs.s?rev=249723&r1=249722&r2=249723&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/test/elf2/aarch64-relocs.s (original)<br>
> +++ lld/trunk/test/elf2/aarch64-relocs.s Thu Oct 8 14:36:39 2015<br>
> @@ -29,7 +29,7 @@ mystr:<br>
> #<br>
> # CHECK: Disassembly of section .R_AARCH64_ADR_PREL_PG_H121:<br>
> # CHECK-NEXT: $x.2:<br>
> -# CHECK-NEXT: 11012: 01 00 00 90 adrp x1, #0<br>
> +# CHECK-NEXT: 401012: 01 00 00 90 adrp x1, #0<br>
><br>
> .section .R_AARCH64_ADD_ABS_LO12_NC,"ax",@progbits<br>
> add x0, x0, :lo12:.L.str<br>
> @@ -43,4 +43,4 @@ mystr:<br>
> #<br>
> # CHECK: Disassembly of section .R_AARCH64_ADD_ABS_LO12_NC:<br>
> # CHECK-NEXT: $x.4:<br>
> -# CHECK-NEXT: 1101b: 00 7c 00 91 add x0, x0, #31<br>
> +# CHECK-NEXT: 40101b: 00 7c 00 91 add x0, x0, #31<br>
><br>
> Modified: lld/trunk/test/elf2/basic-aarch64.s<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic-aarch64.s?rev=249723&r1=249722&r2=249723&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic-aarch64.s?rev=249723&r1=249722&r2=249723&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/test/elf2/basic-aarch64.s (original)<br>
> +++ lld/trunk/test/elf2/basic-aarch64.s Thu Oct 8 14:36:39 2015<br>
> @@ -59,7 +59,7 @@ _start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_EXECINSTR (0x4)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x11000<br>
> +# CHECK-NEXT: Address: 0x401000<br>
> # CHECK-NEXT: Offset: 0x1000<br>
> # CHECK-NEXT: Size: 12<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -75,7 +75,7 @@ _start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_WRITE (0x1)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x1100C<br>
> +# CHECK-NEXT: Address: 0x40100C<br>
> # CHECK-NEXT: Offset: 0x100C<br>
> # CHECK-NEXT: Size: 0<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -91,7 +91,7 @@ _start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_WRITE (0x1)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x1100C<br>
> +# CHECK-NEXT: Address: 0x40100C<br>
> # CHECK-NEXT: Offset: 0x100C<br>
> # CHECK-NEXT: Size: 0<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -140,7 +140,7 @@ _start:<br>
> # CHECK-NEXT: }<br>
> # CHECK-NEXT: Symbol {<br>
> # CHECK-NEXT: Name: $x.0 (41)<br>
> -# CHECK-NEXT: Value: 0x11000<br>
> +# CHECK-NEXT: Value: 0x401000<br>
> # CHECK-NEXT: Size: 0<br>
> # CHECK-NEXT: Binding: Local (0x0)<br>
> # CHECK-NEXT: Type: None (0x0)<br>
> @@ -161,8 +161,8 @@ _start:<br>
> # CHECK-NEXT: ProgramHeader {<br>
> # CHECK-NEXT: Type: PT_LOAD (0x1)<br>
> # CHECK-NEXT: Offset: 0x0<br>
> -# CHECK-NEXT: VirtualAddress: 0x10000<br>
> -# CHECK-NEXT: PhysicalAddress: 0x10000<br>
> +# CHECK-NEXT: VirtualAddress: 0x400000<br>
> +# CHECK-NEXT: PhysicalAddress: 0x400000<br>
> # CHECK-NEXT: FileSize: 176<br>
> # CHECK-NEXT: MemSize: 176<br>
> # CHECK-NEXT: Flags [<br>
> @@ -173,8 +173,8 @@ _start:<br>
> # CHECK-NEXT: ProgramHeader {<br>
> # CHECK-NEXT: Type: PT_LOAD (0x1)<br>
> # CHECK-NEXT: Offset: 0x1000<br>
> -# CHECK-NEXT: VirtualAddress: 0x11000<br>
> -# CHECK-NEXT: PhysicalAddress: 0x11000<br>
> +# CHECK-NEXT: VirtualAddress: 0x401000<br>
> +# CHECK-NEXT: PhysicalAddress: 0x401000<br>
> # CHECK-NEXT: FileSize: 12<br>
> # CHECK-NEXT: MemSize: 12<br>
> # CHECK-NEXT: Flags [ (0x5)<br>
><br>
> Modified: lld/trunk/test/elf2/basic-mips.s<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic-mips.s?rev=249723&r1=249722&r2=249723&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic-mips.s?rev=249723&r1=249722&r2=249723&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/test/elf2/basic-mips.s (original)<br>
> +++ lld/trunk/test/elf2/basic-mips.s Thu Oct 8 14:36:39 2015<br>
> @@ -25,7 +25,7 @@ __start:<br>
> # CHECK-NEXT: Type: Executable (0x2)<br>
> # CHECK-NEXT: Machine: EM_MIPS (0x8)<br>
> # CHECK-NEXT: Version: 1<br>
> -# CHECK-NEXT: Entry: 0x12000<br>
> +# CHECK-NEXT: Entry: 0x402000<br>
> # CHECK-NEXT: ProgramHeaderOffset: 0x34<br>
> # CHECK-NEXT: SectionHeaderOffset: 0x2074<br>
> # CHECK-NEXT: Flags [ (0x0)<br>
> @@ -59,7 +59,7 @@ __start:<br>
> # CHECK-NEXT: Flags [ (0x2)<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x11000<br>
> +# CHECK-NEXT: Address: 0x401000<br>
> # CHECK-NEXT: Offset: 0x1000<br>
> # CHECK-NEXT: Size: 24<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -74,7 +74,7 @@ __start:<br>
> # CHECK-NEXT: Flags [ (0x2)<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x11018<br>
> +# CHECK-NEXT: Address: 0x401018<br>
> # CHECK-NEXT: Offset: 0x1018<br>
> # CHECK-NEXT: Size: 24<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -90,7 +90,7 @@ __start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_EXECINSTR (0x4)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x12000<br>
> +# CHECK-NEXT: Address: 0x402000<br>
> # CHECK-NEXT: Offset: 0x2000<br>
> # CHECK-NEXT: Size: 12<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -106,7 +106,7 @@ __start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_WRITE (0x1)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x12010<br>
> +# CHECK-NEXT: Address: 0x402010<br>
> # CHECK-NEXT: Offset: 0x2010<br>
> # CHECK-NEXT: Size: 0<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -122,7 +122,7 @@ __start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_WRITE (0x1)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x12010<br>
> +# CHECK-NEXT: Address: 0x402010<br>
> # CHECK-NEXT: Offset: 0x2010<br>
> # CHECK-NEXT: Size: 0<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -171,7 +171,7 @@ __start:<br>
> # CHECK-NEXT: }<br>
> # CHECK-NEXT: Symbol {<br>
> # CHECK-NEXT: Name: __start (7)<br>
> -# CHECK-NEXT: Value: 0x12000<br>
> +# CHECK-NEXT: Value: 0x402000<br>
> # CHECK-NEXT: Size: 0<br>
> # CHECK-NEXT: Binding: Global (0x1)<br>
> # CHECK-NEXT: Type: None (0x0)<br>
> @@ -183,8 +183,8 @@ __start:<br>
> # CHECK-NEXT: ProgramHeader {<br>
> # CHECK-NEXT: Type: PT_LOAD (0x1)<br>
> # CHECK-NEXT: Offset: 0x0<br>
> -# CHECK-NEXT: VirtualAddress: 0x10000<br>
> -# CHECK-NEXT: PhysicalAddress: 0x10000<br>
> +# CHECK-NEXT: VirtualAddress: 0x400000<br>
> +# CHECK-NEXT: PhysicalAddress: 0x400000<br>
> # CHECK-NEXT: FileSize: 4144<br>
> # CHECK-NEXT: MemSize: 4144<br>
> # CHECK-NEXT: Flags [ (0x4)<br>
> @@ -195,8 +195,8 @@ __start:<br>
> # CHECK-NEXT: ProgramHeader {<br>
> # CHECK-NEXT: Type: PT_LOAD (0x1)<br>
> # CHECK-NEXT: Offset: 0x2000<br>
> -# CHECK-NEXT: VirtualAddress: 0x12000<br>
> -# CHECK-NEXT: PhysicalAddress: 0x12000<br>
> +# CHECK-NEXT: VirtualAddress: 0x402000<br>
> +# CHECK-NEXT: PhysicalAddress: 0x402000<br>
> # CHECK-NEXT: FileSize: 16<br>
> # CHECK-NEXT: MemSize: 16<br>
> # CHECK-NEXT: Flags [ (0x5)<br>
><br>
> Modified: lld/trunk/test/elf2/basic32be.s<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic32be.s?rev=249723&r1=249722&r2=249723&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic32be.s?rev=249723&r1=249722&r2=249723&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/test/elf2/basic32be.s (original)<br>
> +++ lld/trunk/test/elf2/basic32be.s Thu Oct 8 14:36:39 2015<br>
> @@ -23,7 +23,7 @@ _start:<br>
> # CHECK-NEXT: Type: Executable (0x2)<br>
> # CHECK-NEXT: Machine: EM_PPC (0x14)<br>
> # CHECK-NEXT: Version: 1<br>
> -# CHECK-NEXT: Entry: 0x11000<br>
> +# CHECK-NEXT: Entry: 0x10001000<br>
> # CHECK-NEXT: ProgramHeaderOffset: 0x34<br>
> # CHECK-NEXT: SectionHeaderOffset: 0x1058<br>
> # CHECK-NEXT: Flags [ (0x0)<br>
> @@ -58,7 +58,7 @@ _start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_EXECINSTR (0x4)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x11000<br>
> +# CHECK-NEXT: Address: 0x10001000<br>
> # CHECK-NEXT: Offset: 0x1000<br>
> # CHECK-NEXT: Size: 12<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -74,7 +74,7 @@ _start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_WRITE (0x1)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x1100C<br>
> +# CHECK-NEXT: Address: 0x1000100C<br>
> # CHECK-NEXT: Offset: 0x100C<br>
> # CHECK-NEXT: Size: 0<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -90,7 +90,7 @@ _start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_WRITE (0x1)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x1100C<br>
> +# CHECK-NEXT: Address: 0x1000100C<br>
> # CHECK-NEXT: Offset: 0x100C<br>
> # CHECK-NEXT: Size: 0<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -131,8 +131,8 @@ _start:<br>
> # CHECK-NEXT: ProgramHeader {<br>
> # CHECK-NEXT: Type: PT_LOAD (0x1)<br>
> # CHECK-NEXT: Offset: 0x0<br>
> -# CHECK-NEXT: VirtualAddress: 0x10000<br>
> -# CHECK-NEXT: PhysicalAddress: 0x10000<br>
> +# CHECK-NEXT: VirtualAddress: 0x10000000<br>
> +# CHECK-NEXT: PhysicalAddress: 0x10000000<br>
> # CHECK-NEXT: FileSize: 116<br>
> # CHECK-NEXT: MemSize: 116<br>
> # CHECK-NEXT: Flags [<br>
> @@ -143,8 +143,8 @@ _start:<br>
> # CHECK-NEXT: ProgramHeader {<br>
> # CHECK-NEXT: Type: PT_LOAD (0x1)<br>
> # CHECK-NEXT: Offset: 0x1000<br>
> -# CHECK-NEXT: VirtualAddress: 0x11000<br>
> -# CHECK-NEXT: PhysicalAddress: 0x11000<br>
> +# CHECK-NEXT: VirtualAddress: 0x10001000<br>
> +# CHECK-NEXT: PhysicalAddress: 0x10001000<br>
> # CHECK-NEXT: FileSize: 12<br>
> # CHECK-NEXT: MemSize: 12<br>
> # CHECK-NEXT: Flags [ (0x5)<br>
><br>
> Modified: lld/trunk/test/elf2/basic64be.s<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic64be.s?rev=249723&r1=249722&r2=249723&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/basic64be.s?rev=249723&r1=249722&r2=249723&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/test/elf2/basic64be.s (original)<br>
> +++ lld/trunk/test/elf2/basic64be.s Thu Oct 8 14:36:39 2015<br>
> @@ -28,7 +28,7 @@ _start:<br>
> # CHECK-NEXT: Type: Executable (0x2)<br>
> # CHECK-NEXT: Machine: EM_PPC64 (0x15)<br>
> # CHECK-NEXT: Version: 1<br>
> -# CHECK-NEXT: Entry: 0x12000<br>
> +# CHECK-NEXT: Entry: 0x10002000<br>
> # CHECK-NEXT: ProgramHeaderOffset: 0x40<br>
> # CHECK-NEXT: SectionHeaderOffset: 0x2078<br>
> # CHECK-NEXT: Flags [ (0x0)<br>
> @@ -65,7 +65,7 @@ _start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_EXECINSTR (0x4)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x11000<br>
> +# CHECK-NEXT: Address: 0x10001000<br>
> # CHECK-NEXT: Offset: 0x1000<br>
> # CHECK-NEXT: Size: 12<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -83,7 +83,7 @@ _start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_WRITE (0x1)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x1100C<br>
> +# CHECK-NEXT: Address: 0x1000100C<br>
> # CHECK-NEXT: Offset: 0x100C<br>
> # CHECK-NEXT: Size: 0<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -101,7 +101,7 @@ _start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_WRITE (0x1)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x12000<br>
> +# CHECK-NEXT: Address: 0x10002000<br>
> # CHECK-NEXT: Offset: 0x2000<br>
> # CHECK-NEXT: Size: 24<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -109,7 +109,7 @@ _start:<br>
> # CHECK-NEXT: AddressAlignment: 1<br>
> # CHECK-NEXT: EntrySize: 0<br>
> # CHECK-NEXT: SectionData (<br>
> -# CHECK-NEXT: 0000: 00000000 00011000 00000000 00000000<br>
> |................|<br>
> +# CHECK-NEXT: 0000: 00000000 10001000 00000000 00000000<br>
> |................|<br>
> # CHECK-NEXT: 0010: 00000000 00000000 |........|<br>
> # CHECK-NEXT: )<br>
> # CHECK-NEXT: }<br>
> @@ -121,7 +121,7 @@ _start:<br>
> # CHECK-NEXT: SHF_ALLOC (0x2)<br>
> # CHECK-NEXT: SHF_WRITE (0x1)<br>
> # CHECK-NEXT: ]<br>
> -# CHECK-NEXT: Address: 0x12018<br>
> +# CHECK-NEXT: Address: 0x10002018<br>
> # CHECK-NEXT: Offset: 0x2018<br>
> # CHECK-NEXT: Size: 0<br>
> # CHECK-NEXT: Link: 0<br>
> @@ -166,8 +166,8 @@ _start:<br>
> # CHECK-NEXT: ProgramHeader {<br>
> # CHECK-NEXT: Type: PT_LOAD (0x1)<br>
> # CHECK-NEXT: Offset: 0x0<br>
> -# CHECK-NEXT: VirtualAddress: 0x10000<br>
> -# CHECK-NEXT: PhysicalAddress: 0x10000<br>
> +# CHECK-NEXT: VirtualAddress: 0x10000000<br>
> +# CHECK-NEXT: PhysicalAddress: 0x10000000<br>
> # CHECK-NEXT: FileSize: 232<br>
> # CHECK-NEXT: MemSize: 232<br>
> # CHECK-NEXT: Flags [<br>
> @@ -178,8 +178,8 @@ _start:<br>
> # CHECK-NEXT: ProgramHeader {<br>
> # CHECK-NEXT: Type: PT_LOAD (0x1)<br>
> # CHECK-NEXT: Offset: 0x1000<br>
> -# CHECK-NEXT: VirtualAddress: 0x11000<br>
> -# CHECK-NEXT: PhysicalAddress: 0x11000<br>
> +# CHECK-NEXT: VirtualAddress: 0x10001000<br>
> +# CHECK-NEXT: PhysicalAddress: 0x10001000<br>
> # CHECK-NEXT: FileSize: 12<br>
> # CHECK-NEXT: MemSize: 12<br>
> # CHECK-NEXT: Flags [ (0x5)<br>
> @@ -191,8 +191,8 @@ _start:<br>
> # CHECK-NEXT: ProgramHeader {<br>
> # CHECK-NEXT: Type: PT_LOAD (0x1)<br>
> # CHECK-NEXT: Offset: 0x2000<br>
> -# CHECK-NEXT: VirtualAddress: 0x12000<br>
> -# CHECK-NEXT: PhysicalAddress: 0x12000<br>
> +# CHECK-NEXT: VirtualAddress: 0x10002000<br>
> +# CHECK-NEXT: PhysicalAddress: 0x10002000<br>
> # CHECK-NEXT: FileSize: 24<br>
> # CHECK-NEXT: MemSize: 24<br>
> # CHECK-NEXT: Flags [ (0x6)<br>
><br>
> Modified: lld/trunk/test/elf2/emulation.s<br>
> URL:<br>
> <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/emulation.s?rev=249723&r1=249722&r2=249723&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf2/emulation.s?rev=249723&r1=249722&r2=249723&view=diff</a><br>
> ==============================================================================<br>
> --- lld/trunk/test/elf2/emulation.s (original)<br>
> +++ lld/trunk/test/elf2/emulation.s Thu Oct 8 14:36:39 2015<br>
> @@ -78,7 +78,7 @@<br>
> # PPC64-NEXT: Type: Executable (0x2)<br>
> # PPC64-NEXT: Machine: EM_PPC64 (0x15)<br>
> # PPC64-NEXT: Version: 1<br>
> -# PPC64-NEXT: Entry: 0x11000<br>
> +# PPC64-NEXT: Entry: 0x10001000<br>
> # PPC64-NEXT: ProgramHeaderOffset: 0x40<br>
> # PPC64-NEXT: SectionHeaderOffset: 0x1060<br>
> # PPC64-NEXT: Flags [ (0x0)<br>
> @@ -109,7 +109,7 @@<br>
> # PPC-NEXT: Type: Executable (0x2)<br>
> # PPC-NEXT: Machine: EM_PPC (0x14)<br>
> # PPC-NEXT: Version: 1<br>
> -# PPC-NEXT: Entry: 0x11000<br>
> +# PPC-NEXT: Entry: 0x10001000<br>
> # PPC-NEXT: ProgramHeaderOffset: 0x34<br>
> # PPC-NEXT: SectionHeaderOffset: 0x104C<br>
> # PPC-NEXT: Flags [ (0x0)<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
><br>
><br>
<br>
</div></div><span class="HOEnZb"><font color="#888888">--<br>
Hal Finkel<br>
Assistant Computational Scientist<br>
Leadership Computing Facility<br>
Argonne National Laboratory<br>
</font></span></blockquote></div><br></div>