Add support for generating nmfs for pnacl pexes with glibc (vs pnacl nexes).

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python
-# Copyright (c) 2011 The Native Client Authors. All rights reserved.
+# Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Nacl SDK tool SCons."""
 
 import __builtin__
 import re
 import os
 import shutil
 import sys
@@ skipping 234 matching lines @@
     pnacl_cc = binprefix + 'dgcc' + binext
     pnacl_cxx = binprefix + 'dg++' + binext
   else:
     print "Unknown frontend"
     sys.exit(-1)
 
   pnacl_ld = binprefix + 'ld' + binext
   pnacl_nativeld = binprefix + 'nativeld' + binext
   pnacl_disass = binprefix + 'dis' + binext
   pnacl_strip = binprefix + 'strip' + binext
+  pnacl_nmf = binprefix + 'nmf' + binext
 
   # NOTE: XXX_flags start with space for easy concatenation
   # The flags generated here get baked into the commands (CC, CXX, LINK)
   # instead of CFLAGS etc to keep them from getting blown away by some
   # tests. Don't add flags here unless they always need to be preserved.
   pnacl_cxx_flags = ''
   pnacl_cc_flags = ' -std=gnu99'
   pnacl_cc_native_flags = ' -std=gnu99' + arch_flag
   pnacl_ld_flags = ' ' + ' '.join(env['PNACL_BCLDFLAGS'])
 
@@ skipping 31 matching lines @@
               # with shared libraries except use them with the toolchain.
               SHLINK=pnacl_cxx + arch_flag + pnacl_ld_flags,
               LD=pnacl_ld,
               NATIVELD=pnacl_nativeld,
               AR=pnacl_ar,
               AS=pnacl_as + arch_flag,
               RANLIB=pnacl_ranlib,
               DISASS=pnacl_disass,
               OBJDUMP=pnacl_disass,
               STRIP=pnacl_strip,
+              GENNMF=pnacl_nmf,
               )
 
 
 def _SetEnvForSdkManually(env):
   def GetEnvOrDummy(v):
     return os.getenv('NACL_SDK_' + v, 'MISSING_SDK_' + v)
 
   env.Replace(# Replace header and lib paths.
               NACL_SDK_INCLUDE=GetEnvOrDummy('INCLUDE'),
               NACL_SDK_LIB=GetEnvOrDummy('LIB'),
@@ skipping 244 matching lines @@
   # Dependency files it produces are to be found in ${LIBPATH}.
   # It is applied recursively to those dependencies in case
   # some of them are linker scripts too.
   ldscript_scanner = SCons.Scanner.Base(
       function=ScanLinkerScript,
       skeys=['.a', '.so', '.pso'],
       path_function=SCons.Scanner.FindPathDirs('LIBPATH'),
       recursive=True
       )
   env.Append(SCANNERS=ldscript_scanner)