commit c618c402a58b0119e068cff75357be0eb762ebdf
author William Hesse <whesse@chromium.org> Mon Jun 22 16:34:02 2015 +0200
committer Adam Langley <agl@google.com> Mon Jun 22 23:29:45 2015 +0000
tree 4ff5668186e98880dccb9fdb256414217d4d29f5
parent bc949292907838573e743aa5745af12fc824f0f4

Give generated assembly files different names for arm and aarch64.

Change-Id: I843e43ec56e14a2697bbdd5d6093fdb4d7cf15c2
Reviewed-on: https://boringssl-review.googlesource.com/5200
Reviewed-by: Adam Langley <agl@google.com>

util/generate_build_files.py

diff --git a/util/generate_build_files.py b/util/generate_build_files.py
index a3661d3..2eae98a 100644
--- a/util/generate_build_files.py
+++ b/util/generate_build_files.py
@@ -434,6 +434,9 @@
       if not output.startswith('src'):
         raise ValueError('output missing src: %s' % output)
       output = os.path.join(outDir, output[4:])
+      if output.endswith('-armx.${ASM_EXT}'):
+        output = output.replace('-armx',
+                                '-armx64' if arch == 'aarch64' else '-armx32')
       output = output.replace('${ASM_EXT}', asm_ext)
 
       if arch in ArchForAsmFilename(filename):