Temporary fix for ARMC6 WIn7 assembler issue.

tools/toolchains/arm.py

@@ -575,19 +575,47 @@ def get_compile_options(self, defines, includes, for_asm=False):
         config_header = self.get_config_header()
         if config_header:
             opts.extend(self.get_config_option(config_header))
-        if for_asm:
-            return [
-                "--cpreproc",
-                "--cpreproc_opts=%s" % ",".join(self.flags['common'] + opts)
-            ]
+        #if for_asm:
+        #    return [
+        #        "--cpreproc",
+        #        "--cpreproc_opts=%s" % ",".join(self.flags['common'] + opts)
+        #    ]
         return opts
 
+#    def assemble(self, source, object, includes):
+#        # Preprocess first, then assemble
+#        dir = join(dirname(object), '.temp')
+#        mkdir(dir)
+#        tempfile = join(dir, basename(object) + '.E.s')
+#
+#        # Build preprocess assemble command
+#        cmd_pre = copy(self.asm)
+#        cmd_pre.extend(self.get_compile_options(
+#            self.get_symbols(True), includes, True))
+#        cmd_pre.extend(["-E", "-o", tempfile, source])
+#
+#        cmd = copy(self.asm)
+#        cmd.extend(self.get_compile_options(
+#            self.get_symbols(True), includes, for_asm=True))
+#        cmd.extend(["-o", object, tempfile])
+#        return [cmd_pre, cmd]
     def assemble(self, source, object, includes):
-        cmd_pre = copy(self.asm)
+        # Preprocess first, then assemble
+        dir = join(dirname(object), '.temp')
+        mkdir(dir)
+        tempfile = join(dir, basename(object) + '.E.s')
+
+        # Build preprocess assemble command
+        cmd_pre = copy(self.cc)
         cmd_pre.extend(self.get_compile_options(
-            self.get_symbols(True), includes, for_asm=True))
-        cmd_pre.extend(["-o", object, source])
-        return [cmd_pre]
+            self.get_symbols(True), includes, True))
+        cmd_pre.extend(["-E", "-o", tempfile, source])
+
+        # Build main assemble command
+        cmd = self.asm + ["-o", object, tempfile]
+
+        # Return command array, don't execute
+        return [cmd_pre, cmd]
 
     def compile(self, cc, source, object, includes):
         cmd = copy(cc)