fastmodel: Update to c++14, and add some missing consts.
authorGabe Black <gabeblack@google.com>
Sat, 10 Oct 2020 10:55:28 +0000 (03:55 -0700)
committerGabe Black <gabeblack@google.com>
Wed, 14 Oct 2020 00:15:42 +0000 (00:15 +0000)
During the review for the CortexR52 model, a comment pointed out where
two consts can be added. Also we switched gem5 over to c++14, but the
project files for these other wrappers were still set to c++11.

Change-Id: I5fecdc896b0290deadcd0f55ea1dfe3806a98177
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35857
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
src/arch/arm/fastmodel/CortexA76/cortex_a76.hh
src/arch/arm/fastmodel/CortexA76/x1/x1.sgproj
src/arch/arm/fastmodel/CortexA76/x2/x2.sgproj
src/arch/arm/fastmodel/CortexA76/x3/x3.sgproj
src/arch/arm/fastmodel/CortexA76/x4/x4.sgproj
src/arch/arm/fastmodel/GIC/GIC.sgproj

index acbae89cca03aab9c3f323569a0134b21210e20f..6088b0a6c58fabb4a2e6a81b27f1b3bfb2bf7b58 100644 (file)
@@ -107,8 +107,8 @@ class CortexA76Cluster : public SimObject
         scx::scx_set_parameter(evs->name() + std::string(".") + n, val);
     }
 
-    CortexA76 *getCore(int num) { return cores.at(num); }
-    sc_core::sc_module *getEvs() { return evs; }
+    CortexA76 *getCore(int num) const { return cores.at(num); }
+    sc_core::sc_module *getEvs() const { return evs; }
 
     CortexA76Cluster(Params &p);
     const Params &params() { return _params; }
index 214653f6501af76c799c36e779716eb1abd0449e..ff839685fb58b66f374207e15e1fb92b700f5874 100644 (file)
@@ -5,7 +5,7 @@ ACTIVE_CONFIG_LINUX  = "gcc";
 ACTIVE_CONFIG_WINDOWS  = "Win64-Release-VC2015";
 config "gcc"
 {
-    ADDITIONAL_COMPILER_SETTINGS = "-O3 -Wall -std=c++11 -Wno-deprecated -Wno-unused-function";
+    ADDITIONAL_COMPILER_SETTINGS = "-O3 -Wall -std=c++14 -Wno-deprecated -Wno-unused-function";
     ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
     BUILD_DIR = "./gcc";
     COMPILER = "gcc-6.4";
index 92eeb4dd3c75501b67341765f7ef9be00e878088..8ecb76f476a9e8c6c630910a9dbd4e125335ad64 100644 (file)
@@ -5,7 +5,7 @@ ACTIVE_CONFIG_LINUX  = "gcc";
 ACTIVE_CONFIG_WINDOWS  = "Win64-Release-VC2015";
 config "gcc"
 {
-    ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++11 -Wno-deprecated -Wno-unused-function";
+    ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++14 -Wno-deprecated -Wno-unused-function";
     ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
     BUILD_DIR = "./gcc";
     COMPILER = "gcc-6.4";
index e661c4f49c973a7b4851e353391a1883f799928c..36cfec737bcad547a57d6d0bb7ae4bdbbfc967b1 100644 (file)
@@ -5,7 +5,7 @@ ACTIVE_CONFIG_LINUX  = "gcc";
 ACTIVE_CONFIG_WINDOWS  = "Win64-Release-VC2015";
 config "gcc"
 {
-    ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++11 -Wno-deprecated -Wno-unused-function";
+    ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++14 -Wno-deprecated -Wno-unused-function";
     ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
     BUILD_DIR = "./gcc";
     COMPILER = "gcc-6.4";
index 5b7f31542e3236bba7233d858e91a895d291544c..291256b67b136d5684bceacfd177f64d4e34d7a3 100644 (file)
@@ -5,7 +5,7 @@ ACTIVE_CONFIG_LINUX  = "gcc";
 ACTIVE_CONFIG_WINDOWS  = "Win64-Release-VC2015";
 config "gcc"
 {
-    ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++11 -Wno-deprecated -Wno-unused-function";
+    ADDITIONAL_COMPILER_SETTINGS = "-march=core2 -O3 -Wall -std=c++14 -Wno-deprecated -Wno-unused-function";
     ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
     BUILD_DIR = "./gcc";
     COMPILER = "gcc-6.4";
index c01670587645ebbdd6985e2e99959f24f27217e1..c835356092be3a62c5a9e8621b46a1d53a9442f5 100644 (file)
@@ -5,7 +5,7 @@ ACTIVE_CONFIG_LINUX  = "gcc";
 ACTIVE_CONFIG_WINDOWS  = "Win64-Release-VC2015";
 config "gcc"
 {
-    ADDITIONAL_COMPILER_SETTINGS = "-O3 -Wall -std=c++11 -Wno-deprecated -Wno-unused-function -I../../../../../";
+    ADDITIONAL_COMPILER_SETTINGS = "-O3 -Wall -std=c++14 -Wno-deprecated -Wno-unused-function -I../../../../../";
     ADDITIONAL_LINKER_SETTINGS = "-Wl,--no-undefined";
     BUILD_DIR = "./gcc";
     COMPILER = "gcc-6.4";