xv6

commit 0875d4b58721f2b8e64aebf924bb664c00b1f817
parent 0af9ab22c3468af477bf19af2871cef4e9bb074a
Author: Brian Swetland <swetland@frotz.net>
Date:   Thu,  2 Jan 2014 00:01:10 -0800

elf: use 64bit elf headers when building in 64bit mode

Diffstat:
M
include/elf.h
 | 
19
++++++++++++++++---

1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/include/elf.h b/include/elf.h
@@ -9,9 +9,9 @@ struct elfhdr {
   ushort type;
   ushort machine;
   uint version;
-  uint entry;
-  uint phoff;
-  uint shoff;
+  uintp entry;
+  uintp phoff;
+  uintp shoff;
   uint flags;
   ushort ehsize;
   ushort phentsize;
@@ -22,6 +22,18 @@ struct elfhdr {
 };
 
 // Program section header
+#if X64
+struct proghdr {
+  uint32 type;
+  uint32 flags;
+  uint64 off;
+  uint64 vaddr;
+  uint64 paddr;
+  uint64 filesz;
+  uint64 memsz;
+  uint64 align;
+};
+#else
 struct proghdr {
   uint type;
   uint off;
@@ -32,6 +44,7 @@ struct proghdr {
   uint flags;
   uint align;
 };
+#endif
 
 // Values for Proghdr type
 #define ELF_PROG_LOAD           1