mbs.cross: support up to c++1z

eclipse-embed-cdt · Jan 14, 2017 · ab3ea8b · ab3ea8b
1 parent 5bbe42a
commit ab3ea8b
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 22 deletions.
diff --git a/ilg.gnuarmeclipse.managedbuild.cross/plugin.properties b/ilg.gnuarmeclipse.managedbuild.cross/plugin.properties
@@ -221,16 +221,24 @@ option.c.compiler.std.ansi = ISO C90 (-ansi)
 option.c.compiler.std.c99 = ISO C99 (-std=c99)
 option.c.compiler.std.c11 = ISO C11 (-std=c11)
 option.c.compiler.std.default = Toolchain default (GNU ISO C90)
+option.c.compiler.std.gnu90 = GNU ISO C90 (-std=gnu90)
 option.c.compiler.std.gnu99 = GNU ISO C99 (-std=gnu99)
 option.c.compiler.std.gnu11 = GNU ISO C11 (-std=gnu11)
+
 option.cpp.compiler.std.ansi = ISO 1998 C++ incl. 2003 amendments (-ansi)
+option.cpp.compiler.std.gnucpp98 = GNU ISO 1998 C++ (-std=gnu++98)
 option.cpp.compiler.std.default = Toolchain default (GNU ISO 1998 C++)
-option.cpp.compiler.std.cpp0x = ISO 2011 C++ (-std=c++0x)
+option.cpp.compiler.std.cpp0x = ISO 2011 C++ (-std=c++0x, deprecated)
 option.cpp.compiler.std.cpp11 = ISO 2011 C++ (-std=c++11)
-option.cpp.compiler.std.gnucpp0x = GNU ISO 2011 C++ (-std=gnu++0x)
+option.cpp.compiler.std.gnucpp0x = GNU ISO 2011 C++ (-std=gnu++0x, deprecated)
 option.cpp.compiler.std.gnucpp11 = GNU ISO 2011 C++ (-std=gnu++11)
-option.cpp.compiler.std.cpp1y = Next ISO C++ (-std=c++1y)
-option.cpp.compiler.std.gnucpp1y = Next GNU ISO C++ (-std=gnu++1y)
+option.cpp.compiler.std.cpp1y = ISO 2014 C++ (-std=c++1y, deprecated)
+option.cpp.compiler.std.cpp14 = ISO 2014 C++ (-std=c++14)
+option.cpp.compiler.std.gnucpp1y = GNU ISO 2014 C++ (-std=gnu++1y, deprecated)
+option.cpp.compiler.std.gnucpp14 = GNU ISO 2014 C++ (-std=gnu++14)
+option.cpp.compiler.std.cpp1z = Next ISO C++ (-std=c++1z)
+option.cpp.compiler.std.gnucpp1z = Next GNU ISO C++ (-std=gnu++1z)
+
 option.cpp.compiler.abiversion = ABI version
 option.cpp.compiler.abiversion.default = Toolchain default (0)
 option.cpp.compiler.abiversion.0 = 0 (most conforming)

diff --git a/ilg.gnuarmeclipse.managedbuild.cross/plugin.xml b/ilg.gnuarmeclipse.managedbuild.cross/plugin.xml
@@ -3016,30 +3016,35 @@
                   name="%option.compiler.std"
                   useByScannerDiscovery="true"
                   valueType="enumerated">
+               <enumeratedOptionValue
+                     id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.default"
+                     name="%option.c.compiler.std.default">
+               </enumeratedOptionValue>
                <enumeratedOptionValue
                      command="-ansi"
                      id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.ansi"
                      name="%option.c.compiler.std.ansi">
                </enumeratedOptionValue>
+               <enumeratedOptionValue
+                     command="-std=gnu90"
+                     id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.gnu90"
+                     name="%option.c.compiler.std.gnu90">
+               </enumeratedOptionValue>
                <enumeratedOptionValue
                      command="-std=c99"
                      id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.c99"
                      name="%option.c.compiler.std.c99">
                </enumeratedOptionValue>
-               <enumeratedOptionValue
-                     command="-std=c11"
-                     id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.c11"
-                     name="%option.c.compiler.std.c11">
-               </enumeratedOptionValue>
-               <enumeratedOptionValue
-                     id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.default"
-                     name="%option.c.compiler.std.default">
-               </enumeratedOptionValue>
                <enumeratedOptionValue
                      command="-std=gnu99"
                      id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.gnu99"
                      name="%option.c.compiler.std.gnu99">
                </enumeratedOptionValue>
+               <enumeratedOptionValue
+                     command="-std=c11"
+                     id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.c11"
+                     name="%option.c.compiler.std.c11">
+               </enumeratedOptionValue>
                <enumeratedOptionValue
                      command="-std=gnu11"
                      id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.gnu11"
@@ -3207,46 +3212,71 @@
                   name="%option.compiler.std"
                   useByScannerDiscovery="true"
                   valueType="enumerated">
+               <enumeratedOptionValue
+                     id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.default"
+                     name="%option.cpp.compiler.std.default">
+               </enumeratedOptionValue>
                <enumeratedOptionValue
                      command="-ansi"
                      id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.ansi"
                      name="%option.cpp.compiler.std.ansi">
                </enumeratedOptionValue>
                <enumeratedOptionValue
-                     id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.default"
-                     name="%option.cpp.compiler.std.default">
+                     command="-std=gnu++98"
+                     id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp98"
+                     name="%option.cpp.compiler.std.gnucpp98">
+               </enumeratedOptionValue>
+               <enumeratedOptionValue
+                     command="-std=c++11"
+                     id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp11"
+                     name="%option.cpp.compiler.std.cpp11">
                </enumeratedOptionValue>
                <enumeratedOptionValue
                      command="-std=c++0x"
                      id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp0x"
                      name="%option.cpp.compiler.std.cpp0x">
                </enumeratedOptionValue>
                <enumeratedOptionValue
-                     command="-std=c++11"
-                     id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp11"
-                     name="%option.cpp.compiler.std.cpp11">
+                     command="-std=gnu++11"
+                     id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp11"
+                     isDefault="true"
+                     name="%option.cpp.compiler.std.gnucpp11">
                </enumeratedOptionValue>
                <enumeratedOptionValue
                      command="-std=gnu++0x"
                      id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp0x"
                      name="%option.cpp.compiler.std.gnucpp0x">
                </enumeratedOptionValue>
                <enumeratedOptionValue
-                     command="-std=gnu++11"
-                     id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp11"
-                     isDefault="true"
-                     name="%option.cpp.compiler.std.gnucpp11">
+                     command="-std=c++14"
+                     id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp14"
+                     name="%option.cpp.compiler.std.cpp14">
                </enumeratedOptionValue>
                <enumeratedOptionValue
                      command="-std=c++1y"
                      id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp1y"
                      name="%option.cpp.compiler.std.cpp1y">
                </enumeratedOptionValue>
+               <enumeratedOptionValue
+                     command="-std=gnu++14"
+                     id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp14"
+                     name="%option.cpp.compiler.std.gnucpp14">
+               </enumeratedOptionValue>
                <enumeratedOptionValue
                      command="-std=gnu++1y"
                      id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp1y"
                      name="%option.cpp.compiler.std.gnucpp1y">
                </enumeratedOptionValue>
+               <enumeratedOptionValue
+                     command="-std=c++1z"
+                     id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp1z"
+                     name="%option.cpp.compiler.std.cpp1z">
+               </enumeratedOptionValue>
+               <enumeratedOptionValue
+                     command="-std=gnu++1z"
+                     id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp1z"
+                     name="%option.cpp.compiler.std.gnucpp1z">
+               </enumeratedOptionValue>
             </option>
             <option
                   category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.cpp.compiler.optimization"