Don't pass the -metadata-text argument to llc, since it's not being used any longer.

pnacl/driver/pnacl-translate.py

 #!/usr/bin/python
 # 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.
 #
 # IMPORTANT NOTE: If you make local mods to this file, you must run:
 #   %  pnacl/build.sh driver
 # in order for them to take effect in the scons build.  This command
 # updates the copy in the toolchain/ tree.
 #
@@ skipping 80 matching lines @@
                  '${LIBGCC_EH}} -l:libgcc.a ${MISC_LIBS}',
 
   'MISC_LIBS':
     # TODO(pdox):
     # Move libcrt_platform into the __pnacl namespace,
     # with stubs to access it from newlib.
     '${LIBMODE_NEWLIB ? -l:libcrt_platform.a} ',
 
   # Determine whether or not to use bitcode metadata to generate .so stubs
   # for the final link.
   'USE_META': '0',

[jvoung (off chromium), 2013/05/14 23:48:46]

Please remove USE_META and bits related to that also.

[eliben, 2013/05/15 15:40:41]

Done.

 
   'TRIPLE'      : '${TRIPLE_%ARCH%}',
   'TRIPLE_ARM'  : 'armv7a-none-nacl-gnueabi',
   'TRIPLE_X8632': 'i686-none-nacl-gnu',
   'TRIPLE_X8664': 'x86_64-none-nacl-gnu',
   'TRIPLE_MIPS32': 'mipsel-none-nacl-gnu',
 
   'LLC_FLAGS_COMMON': '${PIC ? -relocation-model=pic} ' +
                       #  -force-tls-non-pic makes the code generator (llc)
                       # do the work that would otherwise be done by
@@ skipping 48 matching lines @@
   # do auto feature detection based on CPUID, but constrained by what is
   # accepted by NaCl validators.
   'LLC_MCPU'        : '-mcpu=${LLC_MCPU_%ARCH%}',
   'LLC_MCPU_ARM'    : 'cortex-a9',
   'LLC_MCPU_X8632'  : 'pentium4',
   'LLC_MCPU_X8664'  : 'core2',
   'LLC_MCPU_MIPS32' : 'mips32r2',
 
   # Note: this is only used in the unsandboxed case
   'RUN_LLC'       : '${LLVM_LLC} ${LLC_FLAGS} ${LLC_MCPU} '
-                    '${input} -o ${output} ' +
-                    '-metadata-text ${output}.meta',
+                    '${input} -o ${output} ',
   # Rate in bits/sec to stream the bitcode from sel_universal over SRPC
   # for testing. Defaults to 1Gbps (effectively unlimited).
   'BITCODE_STREAM_RATE' : '1000000000',
 }
 
 
 TranslatorPatterns = [
   ( '-o(.+)',          "env.set('OUTPUT', pathtools.normalize($0))"),
   ( ('-o', '(.+)'),    "env.set('OUTPUT', pathtools.normalize($0))"),
 
@@ skipping 306 matching lines @@
   env.setmany(input=infile, output=outfile, filetype=filetype)
   if env.getbool('SANDBOXED'):
     is_shared, soname, needed = RunLLCSandboxed()
     env.pop()
     # soname and dt_needed libs are returned from LLC and passed to LD
     driver_tools.SetBitcodeMetadata(infile, is_shared, soname, needed)
   else:
     driver_tools.Run("${RUN_LLC}")
     # As a side effect, this creates a temporary file
     if not env.getbool('SAVE_TEMPS'):
       TempFiles.add(outfile + '.meta')

[jvoung (off chromium), 2013/05/14 23:48:46]

Without the -meta... flag, there won't be a temp .meta file anymore to clean up.

[eliben, 2013/05/15 15:40:41]

Done.

     env.pop()
   return 0
 
 def RunLLCSandboxed():
   driver_tools.CheckTranslatorPrerequisites()
   infile = env.getone('input')
   outfile = env.getone('output')
   if not driver_tools.IsBitcode(infile):
     Log.Fatal('Input to sandboxed translator must be bitcode')
   script = MakeSelUniversalScriptForLLC(infile, outfile)
@@ skipping 65 matching lines @@
 
 ADVANCED OPTIONS:
   -mattr=<+feat1,-feat2>  Toggle specific cpu features on and off.
   -mcpu=<cpu-name>        Target a specific cpu type.  Tunes code as well as
                           turns cpu features on and off.
   -S                      Generate native assembly only.
   -c                      Generate native object file only.
   --pnacl-sb              Use the translator which runs inside the NaCl sandbox.
   -O[0-3]                 Change translation-time optimization level.
 """