Skip to content

Commit ab3ea8b

Browse files
ilg-ulilg-ul
committed
mbs.cross: support up to c++1z
1 parent 5bbe42a commit ab3ea8b

File tree

2 files changed

+60
-22
lines changed

2 files changed

+60
-22
lines changed

‎ilg.gnuarmeclipse.managedbuild.cross/plugin.properties

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,16 +221,24 @@ option.c.compiler.std.ansi = ISO C90 (-ansi)
221221
option.c.compiler.std.c99 = ISO C99 (-std=c99)
222222
option.c.compiler.std.c11 = ISO C11 (-std=c11)
223223
option.c.compiler.std.default = Toolchain default (GNU ISO C90)
224+
option.c.compiler.std.gnu90 = GNU ISO C90 (-std=gnu90)
224225
option.c.compiler.std.gnu99 = GNU ISO C99 (-std=gnu99)
225226
option.c.compiler.std.gnu11 = GNU ISO C11 (-std=gnu11)
227+
226228
option.cpp.compiler.std.ansi = ISO 1998 C++ incl. 2003 amendments (-ansi)
229+
option.cpp.compiler.std.gnucpp98 = GNU ISO 1998 C++ (-std=gnu++98)
227230
option.cpp.compiler.std.default = Toolchain default (GNU ISO 1998 C++)
228-
option.cpp.compiler.std.cpp0x = ISO 2011 C++ (-std=c++0x)
231+
option.cpp.compiler.std.cpp0x = ISO 2011 C++ (-std=c++0x, deprecated)
229232
option.cpp.compiler.std.cpp11 = ISO 2011 C++ (-std=c++11)
230-
option.cpp.compiler.std.gnucpp0x = GNU ISO 2011 C++ (-std=gnu++0x)
233+
option.cpp.compiler.std.gnucpp0x = GNU ISO 2011 C++ (-std=gnu++0x, deprecated)
231234
option.cpp.compiler.std.gnucpp11 = GNU ISO 2011 C++ (-std=gnu++11)
232-
option.cpp.compiler.std.cpp1y = Next ISO C++ (-std=c++1y)
233-
option.cpp.compiler.std.gnucpp1y = Next GNU ISO C++ (-std=gnu++1y)
235+
option.cpp.compiler.std.cpp1y = ISO 2014 C++ (-std=c++1y, deprecated)
236+
option.cpp.compiler.std.cpp14 = ISO 2014 C++ (-std=c++14)
237+
option.cpp.compiler.std.gnucpp1y = GNU ISO 2014 C++ (-std=gnu++1y, deprecated)
238+
option.cpp.compiler.std.gnucpp14 = GNU ISO 2014 C++ (-std=gnu++14)
239+
option.cpp.compiler.std.cpp1z = Next ISO C++ (-std=c++1z)
240+
option.cpp.compiler.std.gnucpp1z = Next GNU ISO C++ (-std=gnu++1z)
241+
234242
option.cpp.compiler.abiversion = ABI version
235243
option.cpp.compiler.abiversion.default = Toolchain default (0)
236244
option.cpp.compiler.abiversion.0 = 0 (most conforming)

‎ilg.gnuarmeclipse.managedbuild.cross/plugin.xml

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3016,30 +3016,35 @@
30163016
name="%option.compiler.std"
30173017
useByScannerDiscovery="true"
30183018
valueType="enumerated">
3019+
<enumeratedOptionValue
3020+
id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.default"
3021+
name="%option.c.compiler.std.default">
3022+
</enumeratedOptionValue>
30193023
<enumeratedOptionValue
30203024
command="-ansi"
30213025
id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.ansi"
30223026
name="%option.c.compiler.std.ansi">
30233027
</enumeratedOptionValue>
3028+
<enumeratedOptionValue
3029+
command="-std=gnu90"
3030+
id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.gnu90"
3031+
name="%option.c.compiler.std.gnu90">
3032+
</enumeratedOptionValue>
30243033
<enumeratedOptionValue
30253034
command="-std=c99"
30263035
id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.c99"
30273036
name="%option.c.compiler.std.c99">
30283037
</enumeratedOptionValue>
3029-
<enumeratedOptionValue
3030-
command="-std=c11"
3031-
id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.c11"
3032-
name="%option.c.compiler.std.c11">
3033-
</enumeratedOptionValue>
3034-
<enumeratedOptionValue
3035-
id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.default"
3036-
name="%option.c.compiler.std.default">
3037-
</enumeratedOptionValue>
30383038
<enumeratedOptionValue
30393039
command="-std=gnu99"
30403040
id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.gnu99"
30413041
name="%option.c.compiler.std.gnu99">
30423042
</enumeratedOptionValue>
3043+
<enumeratedOptionValue
3044+
command="-std=c11"
3045+
id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.c11"
3046+
name="%option.c.compiler.std.c11">
3047+
</enumeratedOptionValue>
30433048
<enumeratedOptionValue
30443049
command="-std=gnu11"
30453050
id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.std.gnu11"
@@ -3207,46 +3212,71 @@
32073212
name="%option.compiler.std"
32083213
useByScannerDiscovery="true"
32093214
valueType="enumerated">
3215+
<enumeratedOptionValue
3216+
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.default"
3217+
name="%option.cpp.compiler.std.default">
3218+
</enumeratedOptionValue>
32103219
<enumeratedOptionValue
32113220
command="-ansi"
32123221
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.ansi"
32133222
name="%option.cpp.compiler.std.ansi">
32143223
</enumeratedOptionValue>
32153224
<enumeratedOptionValue
3216-
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.default"
3217-
name="%option.cpp.compiler.std.default">
3225+
command="-std=gnu++98"
3226+
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp98"
3227+
name="%option.cpp.compiler.std.gnucpp98">
3228+
</enumeratedOptionValue>
3229+
<enumeratedOptionValue
3230+
command="-std=c++11"
3231+
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp11"
3232+
name="%option.cpp.compiler.std.cpp11">
32183233
</enumeratedOptionValue>
32193234
<enumeratedOptionValue
32203235
command="-std=c++0x"
32213236
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp0x"
32223237
name="%option.cpp.compiler.std.cpp0x">
32233238
</enumeratedOptionValue>
32243239
<enumeratedOptionValue
3225-
command="-std=c++11"
3226-
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp11"
3227-
name="%option.cpp.compiler.std.cpp11">
3240+
command="-std=gnu++11"
3241+
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp11"
3242+
isDefault="true"
3243+
name="%option.cpp.compiler.std.gnucpp11">
32283244
</enumeratedOptionValue>
32293245
<enumeratedOptionValue
32303246
command="-std=gnu++0x"
32313247
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp0x"
32323248
name="%option.cpp.compiler.std.gnucpp0x">
32333249
</enumeratedOptionValue>
32343250
<enumeratedOptionValue
3235-
command="-std=gnu++11"
3236-
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp11"
3237-
isDefault="true"
3238-
name="%option.cpp.compiler.std.gnucpp11">
3251+
command="-std=c++14"
3252+
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp14"
3253+
name="%option.cpp.compiler.std.cpp14">
32393254
</enumeratedOptionValue>
32403255
<enumeratedOptionValue
32413256
command="-std=c++1y"
32423257
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp1y"
32433258
name="%option.cpp.compiler.std.cpp1y">
32443259
</enumeratedOptionValue>
3260+
<enumeratedOptionValue
3261+
command="-std=gnu++14"
3262+
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp14"
3263+
name="%option.cpp.compiler.std.gnucpp14">
3264+
</enumeratedOptionValue>
32453265
<enumeratedOptionValue
32463266
command="-std=gnu++1y"
32473267
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp1y"
32483268
name="%option.cpp.compiler.std.gnucpp1y">
32493269
</enumeratedOptionValue>
3270+
<enumeratedOptionValue
3271+
command="-std=c++1z"
3272+
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp1z"
3273+
name="%option.cpp.compiler.std.cpp1z">
3274+
</enumeratedOptionValue>
3275+
<enumeratedOptionValue
3276+
command="-std=gnu++1z"
3277+
id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp1z"
3278+
name="%option.cpp.compiler.std.gnucpp1z">
3279+
</enumeratedOptionValue>
32503280
</option>
32513281
<option
32523282
category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.cpp.compiler.optimization"

0 commit comments

Comments
 (0)