Subzero. ARM32. Refactors atomic intrinsics lowering.

pydir/build-runtime.py

 #!/usr/bin/env python2
 
 import argparse
 import os
 import shutil
 import tempfile
 
 import targets
 from utils import shellcmd
 from utils import FindBaseNaCl
@@ skipping 47 matching lines @@
               ['-mtriple=' + target_info.triple] + target_info.llc_flags,
               TmpFile('{dir}/szrt_native_{target}.tmp.o'),
               verbose)
     # Compile srcdir/szrt_profiler.c to
     # tempdir/szrt_profiler_native_{target}.o.
     shellcmd(['clang',
               '-O2',
               '-target=' + target_info.triple,
               '-c',
               '{srcdir}/szrt_profiler.c'.format(srcdir=srcdir),
-              '-o', TmpFile('{dir}/szrt_profiler_native_{target}.o')
+              '-o', TmpFile('{dir}/szrt_native_profiler_{target}.o')
+      ], echo=verbose)
+    # Assemble srcdir/szrt_asm_{target}.s to tempdir/szrt_asm_{target}.o.
+    shellcmd(['llvm-mc',
+              '-triple=' + target_info.triple, '--defsym NATIVE=1',
+              '-filetype=obj',
+              '-o', TmpFile('{dir}/szrt_native_asm_{target}.o'),
+              '{srcdir}/szrt_asm_{target}.s'.format(
+                srcdir=srcdir, target=target_info.target)
       ], echo=verbose)
     # Write full szrt_native_{target}.o.
     PartialLink([TmpFile('{dir}/szrt_native_{target}.tmp.o'),
-                 TmpFile('{dir}/szrt_profiler_native_{target}.o')],
+                 TmpFile('{dir}/szrt_native_asm_{target}.o'),
+                 TmpFile('{dir}/szrt_native_profiler_{target}.o')],
                 ['-m {ld_emu}'.format(ld_emu=target_info.ld_emu)],
                 OutFile('{rtdir}/szrt_native_{target}.o'),
                 verbose)
+    shellcmd(['le32-nacl-objcopy',
+              '--strip-symbol=NATIVE',
+              OutFile('{rtdir}/szrt_native_{target}.o')])
+
   # Helper function for building the sandboxed runtime.
   def MakeSandboxedRuntime():
     """Builds just the sandboxed runtime."""
     # Translate tempdir/szrt.ll and tempdir/szrt_ll.ll to szrt_sb_{target}.o.
     # The sandboxed library does not get the profiler helper function as the
     # binaries are linked with -nostdlib.
     Translate(ll_files,
               ['-mtriple=' + targets.ConvertTripleToNaCl(target_info.triple)] +
               target_info.llc_flags,
-              OutFile('{rtdir}/szrt_sb_{target}.o'),
+              TmpFile('{dir}/szrt_sb_{target}.tmp.o'),
               verbose)
+    # Assemble srcdir/szrt_asm_{target}.s to tempdir/szrt_asm_{target}.o.
+    shellcmd(['llvm-mc',
+              '-triple=' + targets.ConvertTripleToNaCl(target_info.triple),
+              '--defsym NACL=1',
+              '-filetype=obj',
+              '-o', TmpFile('{dir}/szrt_sb_asm_{target}.o'),
+              '{srcdir}/szrt_asm_{target}.s'.format(
+                srcdir=srcdir, target=target_info.target)
+      ], echo=verbose)
+    PartialLink([TmpFile('{dir}/szrt_sb_{target}.tmp.o'),
+                 TmpFile('{dir}/szrt_sb_asm_{target}.o')],
+                ['-m {ld_emu}'.format(ld_emu=target_info.sb_emu)],
+                OutFile('{rtdir}/szrt_sb_{target}.o'),
+                verbose)
+    shellcmd(['le32-nacl-objcopy',
+              '--strip-symbol=NACL',
+              OutFile('{rtdir}/szrt_sb_{target}.o')])
+
   # Helper function for building the Non-SFI runtime.
   def MakeNonsfiRuntime():
     """Builds just the nonsfi runtime."""
     # Translate tempdir/szrt.ll and tempdir/szrt_ll.ll to
     # szrt_nonsfi_{target}.tmp.o.
     Translate(ll_files,
               ['-mtriple=' + target_info.triple] + target_info.llc_flags +
               ['-relocation-model=pic', '-force-tls-non-pic', '-malign-double'],
               TmpFile('{dir}/szrt_nonsfi_{target}.tmp.o'),
               verbose)
     # Assemble srcdir/szrt_asm_{target}.s to tempdir/szrt_asm_{target}.o.
     shellcmd(['llvm-mc',
-              '-triple=' + target_info.triple,
+              '-triple=' + target_info.triple, '--defsym NONSFI=1',
               '-filetype=obj',
-              '-o', TmpFile('{dir}/szrt_asm_{target}.o'),
+              '-o', TmpFile('{dir}/szrt_nonsfi_asm_{target}.o'),
               '{srcdir}/szrt_asm_{target}.s'.format(
                 srcdir=srcdir, target=target_info.target)
       ], echo=verbose)
     # Write full szrt_nonsfi_{target}.o.
     PartialLink([TmpFile('{dir}/szrt_nonsfi_{target}.tmp.o'),
-                 TmpFile('{dir}/szrt_asm_{target}.o')],
+                 TmpFile('{dir}/szrt_nonsfi_asm_{target}.o')],
                 ['-m {ld_emu}'.format(ld_emu=target_info.ld_emu)],
                 OutFile('{rtdir}/szrt_nonsfi_{target}.o'),
                 verbose)
+    shellcmd(['le32-nacl-objcopy',
+              '--strip-symbol=NONSFI',
+              OutFile('{rtdir}/szrt_nonsfi_{target}.o')])
+
 
   # Run the helper functions.
   MakeNativeRuntime()
   MakeSandboxedRuntime()
   MakeNonsfiRuntime()
 
 
 def main():
     """Build the Subzero runtime support library for all architectures.
     """
@@ skipping 51 matching lines @@
 
     finally:
         try:
             shutil.rmtree(tempdir)
         except OSError as exc:
             if exc.errno != errno.ENOENT: # ENOENT - no such file or directory
                 raise # re-raise exception
 
 if __name__ == '__main__':
     main()