nacl_helper_bootstrap: Reserve correct address space size for ARM, none for x86-64

chrome/nacl.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'include': [
     '../native_client/build/untrusted.gypi',
   ],
   'target_defaults': {
     'variables': {
@@ skipping 109 matching lines @@
                 'defines': [
                   'NACL_BLOCK_SHIFT=5',
                   'NACL_BLOCK_SIZE=32',
                   '<@(nacl_defines)',
                 ],
               },
             },
           ],
         }],
         ['OS=="linux" and coverage==0', {
+          'conditions': [
+            ['target_arch=="x64"', {
+              'variables': {
+                # No extra reservation.
+                'nacl_reserve_top': [],
+              }
+            }],
+            ['target_arch=="ia32"', {
+              'variables': {
+                # 1G address space.
+                'nacl_reserve_top': ['--defsym', 'RESERVE_TOP=0x40000000'],
+              }
+            }],
+            ['target_arch=="arm"', {
+              'variables': {
+                # 1G address space, plus 4K guard area above because
+                # immediate offsets are 12 bits.
+                'nacl_reserve_top': ['--defsym', 'RESERVE_TOP=0x40001000'],

[Mark Seaborn, 2011/11/18 00:31:03]

As an aside, do we cross-check this?  If I lower either of these two values,
does it cause a test to fail?  Does the size get passed through at runtime?

+              }
+            }],
+          ],
           'targets': [
             {
               'target_name': 'nacl_helper',
               'type': 'executable',
               'include_dirs': [
                 '..',
               ],
               'dependencies': [
                 'nacl',
               ],
@@ skipping 127 matching lines @@
                     }],
                     ['target_arch=="ia32"', {
                       'variables': {
                         'linker_emulation': 'elf_i386',
                         'bootstrap_extra_lib': '',
                       }
                     }],
                     ['target_arch=="arm"', {
                       'variables': {
                         'linker_emulation': 'armelf_linux_eabi',
-                        # ARM requires linking against libc due to ABI dependencies on
-                        # memset
+                        # ARM requires linking against libc due to ABI
+                        # dependencies on memset.
                         'bootstrap_extra_lib' : "${SYSROOT}/usr/lib/libc.a",
                       }
                     }],
                   ],
                   'action': ['../tools/ld_bfd/ld',
                              '-m', '<(linker_emulation)',
                              '--build-id',
-                             # This program is (almost) entirely standalone.  It
-                             # has its own startup code, so no crt1.o for it.  It is
-                             # statically linked, and on x86 it does not use
-                             # libc at all.  However, on ARM it needs a few (safe)
-                             # things from libc.
+                             # This program is (almost) entirely
+                             # standalone.  It has its own startup code, so
+                             # no crt1.o for it.  It is statically linked,
+                             # and on x86 it does not use libc at all.
+                             # However, on ARM it needs a few (safe) things
+                             # from libc.
                              '-static',
-                             # Link with custom linker script for special layout.
+                             # Link with custom linker script for special
+                             # layout.  The script uses the symbol RESERVE_TOP.
+                             '<@(nacl_reserve_top)',
                              '--script=<(linker_script)',
                              '-o', '<@(_outputs)',
                              # On x86-64, the default page size with some
                              # linkers is 2M rather than the real Linux page
                              # size of 4K.  A larger page size is incompatible
                              # with our custom linker script's special layout.
                              '-z', 'max-page-size=0x1000',
                              '--whole-archive', '<(bootstrap_lib)',
                              '--no-whole-archive',
                              '<@(bootstrap_extra_lib)',
@@ skipping 36 matching lines @@
               'target_name': 'nacl_win64',
               'type': 'none',
               'sources': [],
             },
           ],
         }],
       ],
     }],
   ],
 }