Use preinclude of mbed_config.h in all toolchains

Author: theotherjimmy

tools/export/iar/__init__.py

@@ -111,11 +111,9 @@ def generate(self):
                self.resources.c_sources + self.resources.cpp_sources + \
                self.resources.objects + self.resources.libraries
         flags = self.flags
-        _, macros = self.toolchain.config.get_config_data()
-        defines = ['-D%s' % d for d in macros] if macros else [""]
         c_flags = list(set(flags['common_flags']
-                                    + flags['c_flags']
-                                    + flags['cxx_flags']))
+                           + flags['c_flags']
+                           + flags['cxx_flags']))
         # Flags set in template to be set by user in IDE
         template = ["--vla", "--no_static_destruction"]
         # Flag invalid if set in template
@@ -136,7 +134,6 @@ def generate(self):
             'device': self.iar_device(),
             'ewp': sep+self.project_name + ".ewp",
             'debugger': debugger,
-            'defines': defines
         }
         ctx.update(flags)
 

tools/export/iar/ewp.tmpl

@@ -479,9 +479,7 @@
 				</option>
 				<option>
 					<name>ADefines</name>
-					{% for d in defines %}
-					<state>{{d}}</state>
-					{% endfor %}
+					<state></state>
 				</option>
 				<option>
 					<name>AList</name>

tools/toolchains/arm.py

@@ -147,16 +147,16 @@ def get_config_option(self, config_header):
 
     def get_compile_options(self, defines, includes, for_asm=False):
         opts = ['-D%s' % d for d in defines]
+        config_header = self.get_config_header()
+        if config_header is not None:
+            opts = opts + self.get_config_option(config_header)
         if for_asm:
             return opts
         if self.RESPONSE_FILES:
             opts += ['--via', self.get_inc_file(includes)]
         else:
             opts += ["-I%s" % i for i in includes]
 
-        config_header = self.get_config_header()
-        if config_header is not None:
-            opts = opts + self.get_config_option(config_header)
         return opts
 
     @hook_tool

tools/toolchains/gcc.py

@@ -148,10 +148,9 @@ def get_compile_options(self, defines, includes, for_asm=False):
         else:
             opts += ["-I%s" % i for i in includes]
 
-        if not for_asm:
-            config_header = self.get_config_header()
-            if config_header is not None:
-                opts = opts + self.get_config_option(config_header)
+        config_header = self.get_config_header()
+        if config_header is not None:
+            opts = opts + self.get_config_option(config_header)
         return opts
 
     @hook_tool

tools/toolchains/iar.py

@@ -140,24 +140,22 @@ def get_config_option(self, config_header):
 
     def get_compile_options(self, defines, includes, for_asm=False):
         opts = ['-D%s' % d for d in defines]
+        config_header = self.get_config_header()
+        if config_header is not None:
+            opts = opts + self.get_config_option(config_header)
         if for_asm :
             return opts
         if self.RESPONSE_FILES:
             opts += ['-f', self.get_inc_file(includes)]
         else:
             opts += ["-I%s" % i for i in includes]
 
-        config_header = self.get_config_header()
-        if config_header is not None:
-            opts = opts + self.get_config_option(config_header)
         return opts
 
     @hook_tool
     def assemble(self, source, object, includes):
-        _, macros = self.config.get_config_data()
-        defines = ['-D%s' % d for d in macros] if macros else [""]
         # Build assemble command
-        cmd = self.asm + self.get_compile_options(self.get_symbols(True), includes, True) + defines + ["-o", object, source]
+        cmd = self.asm + self.get_compile_options(self.get_symbols(True), includes, True) + ["-o", object, source]
 
         # Call cmdline hook
         cmd = self.hook.get_cmdline_assembler(cmd)