[llvm-commits] [llvm] r171650 - in /llvm/trunk: include/llvm/Object/ELF.h test/Object/Inputs/program-headers.elf-x86-64 test/Object/objdump-private-headers.test

[Michael J. Spencer]

Author: mspencer
Date: Sat Jan  5 21:57:11 2013
New Revision: 171650

URL: http://llvm.org/viewvc/llvm-project?rev=171650&view=rev
Log:
[Object][ELF] Fix incorrect size of members for the 64 version of Elf_Phdr_Impl.

Added:
    llvm/trunk/test/Object/Inputs/program-headers.elf-x86-64
Modified:
    llvm/trunk/include/llvm/Object/ELF.h
    llvm/trunk/test/Object/objdump-private-headers.test

Modified: llvm/trunk/include/llvm/Object/ELF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/ELF.h?rev=171650&r1=171649&r2=171650&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/ELF.h (original)
+++ llvm/trunk/include/llvm/Object/ELF.h Sat Jan  5 21:57:11 2013
@@ -464,9 +464,9 @@
   Elf_Off  p_offset; // FileOffset where segment is located, in bytes
   Elf_Addr p_vaddr;  // Virtual Address of beginning of segment
   Elf_Addr p_paddr;  // Physical address of beginning of segment (OS-specific)
-  Elf_Word p_filesz; // Num. of bytes in file image of segment (may be zero)
-  Elf_Word p_memsz;  // Num. of bytes in mem image of segment (may be zero)
-  Elf_Word p_align;  // Segment alignment constraint
+  Elf_Xword p_filesz; // Num. of bytes in file image of segment (may be zero)
+  Elf_Xword p_memsz;  // Num. of bytes in mem image of segment (may be zero)
+  Elf_Xword p_align;  // Segment alignment constraint
 };
 
 template<endianness target_endianness, std::size_t max_alignment, bool is64Bits>

Added: llvm/trunk/test/Object/Inputs/program-headers.elf-x86-64
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/Inputs/program-headers.elf-x86-64?rev=171650&view=auto
==============================================================================
Binary files llvm/trunk/test/Object/Inputs/program-headers.elf-x86-64 (added) and llvm/trunk/test/Object/Inputs/program-headers.elf-x86-64 Sat Jan  5 21:57:11 2013 differ

Modified: llvm/trunk/test/Object/objdump-private-headers.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/objdump-private-headers.test?rev=171650&r1=171649&r2=171650&view=diff
==============================================================================
--- llvm/trunk/test/Object/objdump-private-headers.test (original)
+++ llvm/trunk/test/Object/objdump-private-headers.test Sat Jan  5 21:57:11 2013
@@ -1,8 +1,18 @@
 RUN: llvm-objdump -p %p/Inputs/program-headers.elf-i386 \
 RUN:              | FileCheck %s -check-prefix ELF-i386
+RUN: llvm-objdump -p %p/Inputs/program-headers.elf-x86-64 \
+RUN:              | FileCheck %s -check-prefix ELF-x86-64
 
 ELF-i386: Program Header:
 ELF-i386:     LOAD off    0x00000000 vaddr 0x08048000 paddr 0x08048000 align 2**12
 ELF-i386:          filesz 0x00000134 memsz 0x00000134 flags r-x
 ELF-i386:    STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**2
 ELF-i386:          filesz 0x00000000 memsz 0x00000000 flags rw-
+
+ELF-x86-64: Program Header:
+ELF-x86-64:     LOAD off    0x0000000000000000 vaddr 0x0000000000400000 paddr 0x0000000000400000 align 2**21
+ELF-x86-64:          filesz 0x0000000000000138 memsz 0x0000000000000138 flags r-x
+ELF-x86-64: EH_FRAME off    0x00000000000000f4 vaddr 0x00000000004000f4 paddr 0x00000000004000f4 align 2**2
+ELF-x86-64:          filesz 0x0000000000000014 memsz 0x0000000000000014 flags r--
+ELF-x86-64:    STACK off    0x0000000000000000 vaddr 0x0000000000000000 paddr 0x0000000000000000 align 2**3
+ELF-x86-64:          filesz 0x0000000000000000 memsz 0x0000000000000000 flags rw-