diff --git a/master.cfg b/master.cfg
index 38f102f..18b4fd8 100644
--- a/master.cfg
+++ b/master.cfg
@@ -1006,9 +1006,6 @@ The parameters of the class are:
     use_system_debuginfo = True
     system_debuginfo_location = "/usr/lib/debug"
 
-    # Disable the use of default_{CFLAGS,CXXFLAGS} when compiling GDB.
-    disable_default_compilation_flags = False
-
     def __init__ (self, architecture_triplet = [], initial_delay = None):
         factory.BuildFactory.__init__ (self)
 
@@ -1052,13 +1049,8 @@ The parameters of the class are:
         if self.use_system_debuginfo:
             self.extra_conf_flags.append ('--with-separate-debug-dir=%s' % self.system_debuginfo_location)
 
-        myCFLAGS = "CFLAGS="
-        myCXXFLAGS = "CXXFLAGS="
-        if not self.disable_default_compilation_flags:
-            myCFLAGS += default_CFLAGS + " "
-            myCXXFLAGS += default_CXXFLAGS + " "
-        myCFLAGS += ' '.join (self.extra_CFLAGS)
-        myCXXFLAGS += ' '.join (self.extra_CXXFLAGS)
+        myCFLAGS = "CFLAGS=" + default_CFLAGS + ' '.join (self.extra_CFLAGS)
+        myCXXFLAGS = "CXXFLAGS=" + default_CXXFLAGS + ' '.join (self.extra_CXXFLAGS)
 
         self.extra_conf_flags.append (myCFLAGS)
         self.extra_conf_flags.append (myCXXFLAGS)
@@ -1293,23 +1285,15 @@ class RunTestGDBSolaris_Common (BuildAndTestGDBFactory):
         # build/23676.  This can be avoided either by performing a -g
         # -O build or with --disable-unit-tests from Sergio's proposed
         # patch.
-        self.disable_default_compilation_flags = True
+        self.extra_CFLAGS = [ '-O' ]
+        self.extra_CXXFLAGS = [ '-O' ]
         BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBPlainSolaris_c64 (RunTestGDBSolaris_Common):
     """Compiling for Solaris"""
     def __init__ (self, **kwargs):
-        self.extra_CFLAGS = [ '-m64' ]
-        self.extra_CXXFLAGS = self.extra_CFLAGS
-        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.disable_default_compilation_flags = True
+        self.extra_CFLAGS.append ('-m64')
+        self.extra_CXXFLAGS.append ('-m64')
         BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 # All branches that are going to be watched.