Merge "misc: Merge branch 'release-staging-v21-0' into develop" into develop

util/tlm/SConstruct

@@ -55,7 +55,7 @@ env.Append(CPPPATH=[gem5_root + '/build/' + gem5_arch,
                     '#examples/common',
                     ])
 
-env.Append(CXXFLAGS=['-std=c++11',
+env.Append(CXXFLAGS=['-std=c++14',
                      '-DSC_INCLUDE_DYNAMIC_PROCESSES',
                      '-DTRACING_ON',
                      ])
@@ -78,6 +78,7 @@ sys.path.append(gem5_root + '/src/python')
 AddOption('--no-colors', dest='use_colors', action='store_false',
           help="Don't add color to abbreviated scons output")
 
+main.SConsignFile('build/systemc/sconsign')
 SConscript(gem5_root + '/ext/systemc/SConscript',
            variant_dir='build/systemc',
            exports='main')

util/tlm/src/sc_master_port.cc

@@ -93,8 +93,7 @@ SCMasterPort::SCMasterPort(const std::string& name_,
     transactor(nullptr),
     simControl(simControl)
 {
-    system =
-        dynamic_cast<const ExternalMasterParams*>(owner_.params())->system;
+    system = dynamic_cast<const ExternalMasterParams&>(owner_.params()).system;
 }
 
 void

util/tlm/src/sc_slave_port.cc

@@ -301,7 +301,7 @@ SCSlavePort::pec(
             packet->makeResponse();
         }
         if (packet->isResponse()) {
-            need_retry = !bridgeResponsePort.sendTimingResp(packet);
+            need_retry = !sendTimingResp(packet);
         }
 
         if (need_retry) {