From 6d4c863d14c2d56cf6d49330b71e1d95379e22bf Mon Sep 17 00:00:00 2001
From: Jesse Chan <jc@linux.com>
Date: Fri, 28 May 2021 08:22:18 +0100
Subject: [PATCH] Revert "[ubuntu] Add GCC 11 (#3291)" (#3436)

This reverts commit 3ebf601284cae6a4406b7ea1ad08cd593a4d619b.

Bug: #3376
---
 images/linux/toolsets/toolset-1804.json | 6 ++----
 images/linux/toolsets/toolset-2004.json | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json
index 9c62b5f49a78..b78e3ce3103e 100644
--- a/images/linux/toolsets/toolset-1804.json
+++ b/images/linux/toolsets/toolset-1804.json
@@ -249,15 +249,13 @@
     "gcc": {
         "versions": [
             "g++-9",
-            "g++-10",
-            "g++-11"
+            "g++-10"
         ]
     },
     "gfortran": {
         "versions": [
             "gfortran-9",
-            "gfortran-10",
-            "gfortran-11"
+            "gfortran-10"
         ]
     },
     "php": {
diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json
index 323b2068e9b7..6bd1616cc4a4 100644
--- a/images/linux/toolsets/toolset-2004.json
+++ b/images/linux/toolsets/toolset-2004.json
@@ -251,15 +251,13 @@
     "gcc": {
         "versions": [
             "g++-9",
-            "g++-10",
-            "g++-11"
+            "g++-10"
         ]
     },
     "gfortran": {
         "versions": [
             "gfortran-9",
-            "gfortran-10",
-            "gfortran-11"
+            "gfortran-10"
         ]
     },
     "php": {