From 3e1b96d899bd5cebaf8fd5f823197a18ca1503bc Mon Sep 17 00:00:00 2001
From: Jimmy Brisson <theotherjimmy@gmail.com>
Date: Wed, 13 Sep 2017 15:14:26 -0500
Subject: [PATCH 1/3] Disable response files on export

None of the exporters can handle them, so just don't do it
---
 tools/export/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/export/__init__.py b/tools/export/__init__.py
index b56f790cbfe..501be59d151 100644
--- a/tools/export/__init__.py
+++ b/tools/export/__init__.py
@@ -310,6 +310,7 @@ def export_project(src_paths, export_path, target, ide, libraries_paths=None,
         extra_verbose=extra_verbose, config=config, build_profile=build_profile,
         app_config=app_config)
     # The first path will give the name to the library
+    toolchain.RESPONSE_FILES = False
     if name is None:
         name = basename(normpath(abspath(src_paths[0])))
 

From 8db0fa9819e362cf3d33d150d9f9c61eff7d5bc1 Mon Sep 17 00:00:00 2001
From: Jimmy Brisson <theotherjimmy@gmail.com>
Date: Thu, 14 Sep 2017 09:14:47 -0500
Subject: [PATCH 2/3] Correct rename mistake in make arm compiler exporters

---
 tools/export/makefile/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/export/makefile/__init__.py b/tools/export/makefile/__init__.py
index 247271aed39..d67e83ff981 100644
--- a/tools/export/makefile/__init__.py
+++ b/tools/export/makefile/__init__.py
@@ -225,7 +225,7 @@ def prepare_sys_lib(libname):
 
     def generate(self):
         if self.resources.linker_script:
-            new_script = self.toolchain.make_real_scatter(
+            new_script = self.toolchain.correct_scatter_shebang(
                 self.resources.linker_script)
             if new_script is not self.resources.linker_script:
                 self.resources.linker_script = new_script

From a62f89da057484e6d19c6289f73b30fb9ed81ed1 Mon Sep 17 00:00:00 2001
From: Jimmy Brisson <theotherjimmy@gmail.com>
Date: Thu, 14 Sep 2017 09:37:29 -0500
Subject: [PATCH 3/3] Correct uvision template to correctly pass include paths

---
 tools/export/uvision/__init__.py  | 5 +++--
 tools/export/uvision/uvision.tmpl | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/export/uvision/__init__.py b/tools/export/uvision/__init__.py
index 12c3241207b..8382bae0f0f 100644
--- a/tools/export/uvision/__init__.py
+++ b/tools/export/uvision/__init__.py
@@ -167,8 +167,9 @@ def format_flags(self):
         """Format toolchain flags for Uvision"""
         flags = copy.deepcopy(self.flags)
         # to be preprocessed with armcc
-        asm_flag_string = '--cpreproc --cpreproc_opts=-D__ASSERT_MSG,' + \
-                          ",".join(flags['asm_flags'])
+        asm_flag_string = (
+            '--cpreproc --cpreproc_opts=-D__ASSERT_MSG,' +
+            ",".join(filter(lambda f: f.startswith("-D"), flags['asm_flags'])))
         flags['asm_flags'] = asm_flag_string
         # All non-asm flags are in one template field
         c_flags = list(set(flags['c_flags'] + flags['cxx_flags'] +flags['common_flags']))
diff --git a/tools/export/uvision/uvision.tmpl b/tools/export/uvision/uvision.tmpl
index f49c79659d4..49c708c3bb1 100644
--- a/tools/export/uvision/uvision.tmpl
+++ b/tools/export/uvision/uvision.tmpl
@@ -394,7 +394,7 @@
               <MiscControls>{{asm_flags}}</MiscControls>
               <Define></Define>
               <Undefine></Undefine>
-              <IncludePath></IncludePath>
+              <IncludePath>{{include_paths}}</IncludePath>
             </VariousControls>
           </Aads>
           <LDads>