From d59ceeb0a57ef16c939a1b2988e7a2d2ab7b60da Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@redhat.com>
Date: Mon, 24 Sep 2018 11:17:13 -0400
Subject: [PATCH] Fix last commit, 4

---
 master.cfg | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/master.cfg b/master.cfg
index 1a32e66..8c57e2b 100644
--- a/master.cfg
+++ b/master.cfg
@@ -1274,25 +1274,28 @@ class RunTestGDBPlainAIX (RunTestGDBAIX_Common, RunTestGDBPlain_c64t64):
 
 # Classes needed for Solaris systems
 
-class RunTestGDBSolaris_Common (BuildAndTestGDBFactory):
-    """Common Solaris test configurations"""
+# class RunTestGDBSolaris_Common (BuildAndTestGDBFactory):
+#     """Common Solaris test configurations"""
+#     def __init__ (self, **kwargs):
+#         self.enable_targets_all = False
+#         self.make_command = 'gmake'
+#         self.run_testsuite = False
+#         # While a regular gdb build succeeds, a -g -D_GLIBCXX_DEBUG
+#         # build as used by the buildbot fails as reported in PR
+#         # build/23676.  This can be avoided either by performing a -g
+#         # -O build or with --disable-unit-tests from Sergio's proposed
+#         # patch.
+#         self.extra_CFLAGS = [ '-O' ]
+#         self.extra_CXXFLAGS = [ '-O' ]
+
+class RunTestGDBPlainSolaris_c64 (BuildAndTestGDBFactory):
+    """Compiling for Solaris"""
     def __init__ (self, **kwargs):
+        self.extra_CFLAGS += [ '-m64', '-O' ]
+        self.extra_CXXFLAGS += [ '-m64', '-O' ]
         self.enable_targets_all = False
         self.make_command = 'gmake'
         self.run_testsuite = False
-        # While a regular gdb build succeeds, a -g -D_GLIBCXX_DEBUG
-        # build as used by the buildbot fails as reported in PR
-        # build/23676.  This can be avoided either by performing a -g
-        # -O build or with --disable-unit-tests from Sergio's proposed
-        # patch.
-        self.extra_CFLAGS = [ '-O' ]
-        self.extra_CXXFLAGS = [ '-O' ]
-
-class RunTestGDBPlainSolaris_c64 (BuildAndTestGDBFactory, RunTestGDBSolaris_Common):
-    """Compiling for Solaris"""
-    def __init__ (self, **kwargs):
-        self.extra_CFLAGS += [ '-m64' ]
-        self.extra_CXXFLAGS += [ '-m64' ]
         BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 # All branches that are going to be watched.