Skip to content

Commit

Permalink
[devtools] Extend language-C accepted values: c17 and c23 (#1032)…
Browse files Browse the repository at this point in the history
… (#1772)

Co-authored-by: Daniel Brondani <daniel.brondani@arm.com>
  • Loading branch information
grasci-arm and brondani authored Sep 13, 2024
1 parent 6612253 commit edef0a9
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ set(WARNINGS_AS_ARM_FLAGS "" "-w" "")
set(WARNINGS_AS_GNU_FLAGS "" "-w" "-Wall")
set(WARNINGS_ASM_FLAGS "" "-w" "-Wall")

set(LANGUAGE_VALUES "c90" "gnu90" "c99" "gnu99" "c11" "gnu11" "c++98" "gnu++98" "c++03" "gnu++03" "c++11" "gnu++11" "c++14" "gnu++14" "c++17" "gnu++17" "c++20" "gnu++20" )
set(LANGUAGE_CC_FLAGS "-std=c90" "-std=gnu90" "-std=c99" "-std=gnu99" "-std=c11" "-std=gnu11" "" "" "" "" "" "" "" "" "" "" "" "" )
set(LANGUAGE_CXX_FLAGS "" "" "" "" "" "" "-std=c++98" "-std=gnu++98" "-std=c++03" "-std=gnu++03" "-std=c++11" "-std=gnu++11" "-std=c++14" "-std=gnu++14" "-std=c++17" "-std=gnu++17" "-std=c++17" "-std=gnu++17")
set(LANGUAGE_VALUES "c90" "gnu90" "c99" "gnu99" "c11" "gnu11" "c17" "c23" "c++98" "gnu++98" "c++03" "gnu++03" "c++11" "gnu++11" "c++14" "gnu++14" "c++17" "gnu++17" "c++20" "gnu++20" )
set(LANGUAGE_CC_FLAGS "-std=c90" "-std=gnu90" "-std=c99" "-std=gnu99" "-std=c11" "-std=gnu11" "-std=c17" "-std=c23" "" "" "" "" "" "" "" "" "" "" "" "" )
set(LANGUAGE_CXX_FLAGS "" "" "" "" "" "" "" "" "-std=c++98" "-std=gnu++98" "-std=c++03" "-std=gnu++03" "-std=c++11" "-std=gnu++11" "-std=c++14" "-std=gnu++14" "-std=c++17" "-std=gnu++17" "-std=c++17" "-std=gnu++17")

function(cbuild_set_option_flags lang option value flags)
if(NOT DEFINED ${option}_${lang}_FLAGS)
Expand Down
6 changes: 3 additions & 3 deletions tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ set(WARNINGS_ASM_FLAGS "" "-w" "-Wall")
set(WARNINGS_CXX_FLAGS "" "-w" "-Wall")
set(WARNINGS_LD_FLAGS "" "-w" "-Wall")

set(LANGUAGE_VALUES "c90" "gnu90" "c99" "gnu99" "c11" "gnu11" "c++98" "gnu++98" "c++03" "gnu++03" "c++11" "gnu++11" "c++14" "gnu++14" "c++17" "gnu++17" "c++20" "gnu++20" )
set(LANGUAGE_CC_FLAGS "-std=c90" "-std=gnu90" "-std=c99" "-std=gnu99" "-std=c11" "-std=gnu11" "" "" "" "" "" "" "" "" "" "" "" "" )
set(LANGUAGE_CXX_FLAGS "" "" "" "" "" "" "-std=c++98" "-std=gnu++98" "-std=c++03" "-std=gnu++03" "-std=c++11" "-std=gnu++11" "-std=c++14" "-std=gnu++14" "-std=c++17" "-std=gnu++17" "-std=c++20" "-std=gnu++20")
set(LANGUAGE_VALUES "c90" "gnu90" "c99" "gnu99" "c11" "gnu11" "c17" "c23" "c++98" "gnu++98" "c++03" "gnu++03" "c++11" "gnu++11" "c++14" "gnu++14" "c++17" "gnu++17" "c++20" "gnu++20" )
set(LANGUAGE_CC_FLAGS "-std=c90" "-std=gnu90" "-std=c99" "-std=gnu99" "-std=c11" "-std=gnu11" "-std=c17" "-std=c23" "" "" "" "" "" "" "" "" "" "" "" "" )
set(LANGUAGE_CXX_FLAGS "" "" "" "" "" "" "" "" "-std=c++98" "-std=gnu++98" "-std=c++03" "-std=gnu++03" "-std=c++11" "-std=gnu++11" "-std=c++14" "-std=gnu++14" "-std=c++17" "-std=gnu++17" "-std=c++20" "-std=gnu++20")

function(cbuild_set_option_flags lang option value flags)
if(NOT DEFINED ${option}_${lang}_FLAGS)
Expand Down
6 changes: 3 additions & 3 deletions tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ set(WARNINGS_AS_GNU_FLAGS "" "-w" "-Wall")
set(WARNINGS_CXX_FLAGS "" "-w" "-Wall")
set(WARNINGS_LD_FLAGS "" "-w" "-Wall")

set(LANGUAGE_VALUES "c90" "gnu90" "c99" "gnu99" "c11" "gnu11" "c++98" "gnu++98" "c++03" "gnu++03" "c++11" "gnu++11" "c++14" "gnu++14" "c++17" "gnu++17" "c++20" "gnu++20" )
set(LANGUAGE_CC_FLAGS "-std=c90" "-std=gnu90" "-std=c99" "-std=gnu99" "-std=c11" "-std=gnu11" "" "" "" "" "" "" "" "" "" "" "" "" )
set(LANGUAGE_CXX_FLAGS "" "" "" "" "" "" "-std=c++98" "-std=gnu++98" "-std=c++03" "-std=gnu++03" "-std=c++11" "-std=gnu++11" "-std=c++14" "-std=gnu++14" "-std=c++17" "-std=gnu++17" "-std=c++20" "-std=gnu++20")
set(LANGUAGE_VALUES "c90" "gnu90" "c99" "gnu99" "c11" "gnu11" "c17" "c23" "c++98" "gnu++98" "c++03" "gnu++03" "c++11" "gnu++11" "c++14" "gnu++14" "c++17" "gnu++17" "c++20" "gnu++20" )
set(LANGUAGE_CC_FLAGS "-std=c90" "-std=gnu90" "-std=c99" "-std=gnu99" "-std=c11" "-std=gnu11" "-std=c17" "-std=c23" "" "" "" "" "" "" "" "" "" "" "" "" )
set(LANGUAGE_CXX_FLAGS "" "" "" "" "" "" "" "" "-std=c++98" "-std=gnu++98" "-std=c++03" "-std=gnu++03" "-std=c++11" "-std=gnu++11" "-std=c++14" "-std=gnu++14" "-std=c++17" "-std=gnu++17" "-std=c++20" "-std=gnu++20")

function(cbuild_set_option_flags lang option value flags)
if(NOT DEFINED ${option}_${lang}_FLAGS)
Expand Down
6 changes: 3 additions & 3 deletions tools/buildmgr/cbuildgen/config/IAR.9.32.1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,9 @@ set(WARNINGS_LD_FLAGS "" "--no_warnings" "--remarks")

# IAR default "Standard C" supports C18/C11
# The option --c89 enables support for ISO 9899:1990 also known as C94, C90, C89, and ANSI C instead of "Standard C"
set(LANGUAGE_VALUES "c90" "gnu90" "c99" "gnu99" "c11" "gnu11" "c++98" "gnu++98" "c++03" "gnu++03" "c++11" "gnu++11" "c++14" "gnu++14" "c++17" "gnu++17" "c++20" "gnu++20")
set(LANGUAGE_CC_FLAGS "--c89" "--c89" "--c89" "--c89" "" "" "" "" "" "" "" "" "" "" "" "" "" "" )
set(LANGUAGE_CXX_FLAGS "" "" "" "" "" "" "--c89" "--c89" "--c89" "--c89" "" "" "" "" "" "" "" "" )
set(LANGUAGE_VALUES "c90" "gnu90" "c99" "gnu99" "c11" "gnu11" "c17" "c23" "c++98" "gnu++98" "c++03" "gnu++03" "c++11" "gnu++11" "c++14" "gnu++14" "c++17" "gnu++17" "c++20" "gnu++20")
set(LANGUAGE_CC_FLAGS "--c89" "--c89" "--c89" "--c89" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" )
set(LANGUAGE_CXX_FLAGS "" "" "" "" "" "" "" "" "--c89" "--c89" "--c89" "--c89" "" "" "" "" "" "" "" "" )

function(cbuild_set_option_flags lang option value flags)
if(NOT DEFINED ${option}_${lang}_FLAGS)
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/schemas/common.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@
"description": "Control warnings (on, off, all)."
},
"LanguageCType": {
"enum": [ "c90", "gnu90", "c99", "gnu99", "c11", "gnu11" ],
"description": "Language standard for C (c90, gnu90, c99, gnu99, c11, gnu11)."
"enum": [ "c90", "gnu90", "c99", "gnu99", "c11", "gnu11", "c17", "c23" ],
"description": "Language standard for C (c90, gnu90, c99, gnu99, c11, gnu11, c17, c23)."
},
"LanguageCppType": {
"enum": [ "c++98", "gnu++98", "c++03", "gnu++03", "c++11", "gnu++11", "c++14", "gnu++14", "c++17", "gnu++17", "c++20", "gnu++20" ],
Expand Down

0 comments on commit edef0a9

Please sign in to comment.