µVision exporter: Separate out C and C++ options

To allow manual specification of the language standard, working around
the limitations of the GUI's own option, modify the template so that we
have C options in the target level, and C++ files get different C++
options. This means whatever language options are specified in the
profile can now be passed directly as "misc control"s, and this
overrides anything the GUI adds, as it comes later in the command line.

Author: kjbracey

tools/export/uvision/__init__.py

@@ -183,25 +183,29 @@ def format_flags(self):
             flags['c_flags'] + flags['cxx_flags'] + flags['common_flags']
         )
         in_template = set(
-            ["--no_vla", "--cpp", "--cpp11", "--c99", "-MMD"] + config_option
+            ["-MMD"] + config_option
         )
 
         def valid_flag(x):
             return (
                 x not in in_template and
                 not x.startswith("-O") and
-                not x.startswith("-std") and
                 not x.startswith("-D")
             )
 
         def is_define(s):
             return s.startswith("-D") and "(" not in s
 
         flags['c_flags'] = " ".join(
-            f.replace('"', '\\"') for f in c_flags if valid_flag(f)
+            f.replace('"', '\\"') for f in flags['c_flags'] if valid_flag(f)
         )
-        flags['c_flags'] += " "
-        flags['c_flags'] += " ".join(config_option)
+        flags['cxx_flags'] = " ".join(
+            f.replace('"', '\\"') for f in flags['cxx_flags'] if valid_flag(f)
+        )
+        flags['common_flags'] = " ".join(
+            f.replace('"', '\\"') for f in flags['common_flags'] if valid_flag(f)
+        )
+        flags['common_flags'] += " ".join(config_option)
         flags['c_defines'] = " ".join(f[2:].replace('"', '\\"')
                                       for f in c_flags if is_define(f))
         flags['ld_flags'] = " ".join(set(flags['ld_flags']))
@@ -289,33 +293,6 @@ def generate(self):
         ctx['armc6'] = int(self.TOOLCHAIN is 'ARMC6')
         ctx['toolchain_name'] = self.TOOLCHAIN_NAME
 
-        std = [flag for flag in self.flags['c_flags'] if flag.startswith("-std=")]
-        if len(std) >= 1:
-            std = std[-1][len('-std='):]
-        else:
-            std = None
-        c_std = {
-            'c89': 1, 'gnu89': 2,
-            'c90': 1, 'gnu90': 2,
-            'c99': 3, 'gnu99': 4,
-            'c11': 5, 'gnu11': 6,
-        }
-        ctx['v6_lang'] = c_std.get(std, 0)
-
-        std = [flag for flag in self.flags['cxx_flags'] if flag.startswith("-std=")]
-        if len(std) >= 1:
-            std = std[-1][len('-std='):]
-        else:
-            std = None
-        cpp_std = {
-            'c++98': 1, 'gnu++98': 2,
-            'c++03': 5, 'gnu++03': 2, # UVision 5.27.1.0 does not support gnu++03 - fall back to gnu++98
-            'c++11': 3, 'gnu++11': 4,
-            'c++14': 6, 'gnu++14': 4, # UVision 5.27.1.0 does not support gnu++14 - should be able to get it as compiler default, but that doesn't work as documented and requests gnu++98. So fall back to gnu++11
-            'c++17': 6, 'gnu++17': 4, # UVision 5.27.1.0 does not support c++17/gnu++17 - fall back to c++14/gnu++11
-        }
-        ctx['v6_lang_p'] = cpp_std.get(std, 0)
-
         ctx.update(self.format_flags())
         self.gen_file(
             'uvision/uvision.tmpl', ctx, self.project_name + ".uvprojx"

tools/export/uvision/uvision.tmpl

@@ -367,17 +367,17 @@
             <wLevel>0</wLevel>
             <uThumb>0</uThumb>
             <uSurpInc>0</uSurpInc>
-            <uC99>1</uC99>
+            <uC99>0</uC99>
             <useXO>0</useXO>
-            <v6Lang>{{v6_lang}}</v6Lang>
-            <v6LangP>{{v6_lang_p}}</v6LangP>
+            <v6Lang>0</v6Lang>
+            <v6LangP>0</v6LangP>
             <vShortEn>1</vShortEn>
             <vShortWch>1</vShortWch>
             <v6Lto>0</v6Lto>
             <v6WtE>0</v6WtE>
             <v6Rtti>0</v6Rtti>
             <VariousControls>
-              <MiscControls>{{c_flags}}</MiscControls>
+              <MiscControls>{{c_flags}} {{common_flags}}</MiscControls>
               <Define>{{c_defines}}</Define>
               <Undefine></Undefine>
               <IncludePath>{{include_paths}}</IncludePath>
@@ -430,6 +430,17 @@
                     <FileType>{{file.type}}</FileType>
                     <FileName>{{file.name}}</FileName>
                     <FilePath>{{file.loc}}</FilePath>
+                    {% if file.type == 8 %}
+                    <FileOption>
+                      <FileArmAds>
+                        <Cads>
+                          <VariousControls>
+                            <MiscControls>{{cxx_flags}} {{common_flags}}</MiscControls>
+                          </VariousControls>
+                        </Cads>
+                      </FileArmAds>
+                    </FileOption>
+                    {% endif %}
                 </File>
                 {% endfor %}
             </Files>