From 07fbb8dc3caf320db9c84a517f86d4283c70d0e6 Mon Sep 17 00:00:00 2001
From: Mark Seaborn <mrs@mythic-beasts.com>
Date: Sun, 26 Apr 2009 21:00:50 +0100
Subject: [PATCH] Update glibc for NaCl's new executable load address

Executables are now loaded at 0x20000.
Syscalls start at 0x10000.
---
 elf_i386.x                   | 2 +-
 sysdeps/nacl/nacl_syscalls.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/elf_i386.x b/elf_i386.x
index 0023b68233..9760e57b32 100644
--- a/elf_i386.x
+++ b/elf_i386.x
@@ -17,7 +17,7 @@ PHDRS
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  PROVIDE (__executable_start = 0x10000); . = 0x10000;
+  PROVIDE (__executable_start = 0x20000); . = 0x20000;
   .interp         : { *(.interp) }
   .note.gnu.build-id : { *(.note.gnu.build-id) }
   .hash           : { *(.hash) }
diff --git a/sysdeps/nacl/nacl_syscalls.h b/sysdeps/nacl/nacl_syscalls.h
index 961f45f226..e6731146ba 100644
--- a/sysdeps/nacl/nacl_syscalls.h
+++ b/sysdeps/nacl/nacl_syscalls.h
@@ -112,7 +112,7 @@
 
 
 #define NACL_SYSCALL_ADDR(syscall_number) \
-  (0x1000 + ((syscall_number) * 32))
+  (0x10000 + ((syscall_number) * 32))
 
 
 struct NaClImcMsgIoVec {
-- 
2.11.4.GIT