Fixes some bugs with memory setup and halt-sled allocation and...

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python2.4
 # Copyright 2009, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 153 matching lines @@
               # where to find/put nacl generic extra sdk libraries
               NACL_SDK_LIB='%s/%s/%s' % (sdk_path, arch, libsuffix),
               # Replace the normal unix tools with the NaCl ones.
               CC=os.path.join(bin_path, '%s-gcc' % arch),
               CXX=os.path.join(bin_path, '%s-g++' % arch),
               AR=os.path.join(bin_path, '%s-ar' % arch),
               AS=os.path.join(bin_path, '%s-as' % arch),
               GDB=os.path.join(bin_path, 'nacl-gdb'),
               # NOTE: use g++ for linking so we can handle C AND C++.
               LINK=os.path.join(bin_path, '%s-g++' % arch),
+              # Grrr... and sometimes we really need ld.
+              LD=os.path.join(bin_path, '%s-ld' % arch),
               RANLIB=os.path.join(bin_path, '%s-ranlib' % arch),
               CFLAGS = ['-std=gnu99'],
               CCFLAGS=['-O3',
                        '-Werror',
                        '-Wall',
                        '-Wswitch-enum',
                        '-g',
                        '-fno-builtin',
                        '-fno-stack-protector',
                        '-fdiagnostics-show-option',
@@ skipping 38 matching lines @@
               # Replace the normal unix tools with the PNaCl ones.
               CC=pnacl_sdk_cc + pnacl_sdk_cc_flags,
               CXX=pnacl_sdk_cxx + pnacl_sdk_cxx_flags,
 
               # NOTE: only in bitcode compilation scenarios where
               #       CC compiles to bitcode and
               #       CC_NATIVE compiles to native code
               #       (CC_NATIVE had to handle both .c and .S files)
               CC_NATIVE=pnacl_sdk_cc + pnacl_sdk_cc_native_flags,
               LINK=pnacl_sdk_ld + pnacl_sdk_ld_flags,
+              # Grrr... and sometimes we need raw assembly and the real ld.
+              LD=(pnacl_sdk_root + '/arm-none-linux-gnueabi/bin/' +
+                  'arm-none-linux-gnueabi-ld'),
               AR=pnacl_sdk_ar,
               RANLIB=pnacl_sdk_ranlib,
               DISASS=pnacl_sdk_disass,
               )
 
 
 def _SetEnvForSdkManually(env):
   def GetEnvOrDummy(v):
     return os.getenv('NACL_SDK_' + v, 'MISSING_SDK_' + v)
 
@@ skipping 92 matching lines @@
     # if bitcode=1 use pnacl toolchain
     if SCons.Script.ARGUMENTS.get('bitcode'):
       _SetEnvForPnacl(env, env['TARGET_FULLARCH'])
     elif env['TARGET_ARCHITECTURE'] == 'x86':
       _SetEnvForX86Sdk(env, root)
     else:
       print "ERROR: unknown TARGET_ARCHITECTURE: ", env['TARGET_ARCHITECTURE']
       assert 0
 
   env.Prepend(LIBPATH='${NACL_SDK_LIB}')