From c0811e995123fde09a89c4a4a62f2396a77dba89 Mon Sep 17 00:00:00 2001
From: Dan Kalowsky <dkalowsky@amperecomputing.com>
Date: Fri, 9 Jul 2021 10:46:46 -0700
Subject: [PATCH] subsys/cpp: update tag for C++2a to C++20

C++20 was tagged and released in December of 2020.  It is no longer
forth coming.

Signed-off-by: Dan Kalowsky <dkalowsky@amperecomputing.com>
---
 CMakeLists.txt     | 4 ++--
 subsys/cpp/Kconfig | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 242e30cd2e4..6e9c176eb0b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,8 +167,8 @@ if(CONFIG_CPLUSPLUS)
     set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp14>)
   elseif(CONFIG_STD_CPP17)
     set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp17>)
-  elseif(CONFIG_STD_CPP2A)
-    set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp2a>)
+  elseif(CONFIG_STD_CPP20)
+    set(STD_CPP_DIALECT_FLAGS $<TARGET_PROPERTY:compiler-cpp,dialect_cpp20>)
   else()
     assert(0 "Unreachable code. Expected C++ standard to have been chosen. See Kconfig.zephyr.")
   endif()
diff --git a/subsys/cpp/Kconfig b/subsys/cpp/Kconfig
index 3acef68a4f4..8172ba9be8f 100644
--- a/subsys/cpp/Kconfig
+++ b/subsys/cpp/Kconfig
@@ -37,10 +37,10 @@ config STD_CPP17
 	help
 	  2017 C++ standard, previously known as C++0x.
 
-config STD_CPP2A
-	bool "C++ 2a"
+config STD_CPP20
+	bool "C++ 20"
 	help
-	  Next revision of the C++ standard, which is expected to be published in 2020.
+	  2020 C++ standard, previously known as C++2A.
 
 endchoice