From 5c41076bd7610d03431fd0dd89bd0fdc7f30d6bd Mon Sep 17 00:00:00 2001 From: Jason Lowe-Power Date: Wed, 13 Dec 2017 10:19:04 -0800 Subject: misc: Updates for gcc7.2 for x86 GCC 7.2 is much stricter than previous GCC versions. The following changes are needed: * There is now a warning if there is an implicit fallthrough between two case statments. C++17 adds the [[fallthrough]]; declaration. However, to support non C++17 standards (i.e., C++11), we use M5_FALLTHROUGH. M5_FALLTHROUGH checks for [[fallthrough]] compliant C++17 compiler and if that doesn't exist, it defaults to nothing (no older compilers generate warnings). * The above resulted in a couple of bugs that were found. This is noted in the review request on gerrit. * throw() for dynamic exception specification is deprecated * There were a couple of new uninitialized variable warnings * Can no longer perform bitwise operations on a bool. * Must now include for std::function * Compiler bug for void* lambda. Changed to auto as work around. See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82878 Change-Id: I5d4c782a4e133fa4cdb119e35d9aff68c6e2958e Signed-off-by: Jason Lowe-Power Reviewed-on: https://gem5-review.googlesource.com/5802 Reviewed-by: Gabe Black --- src/dev/arm/generic_timer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dev/arm/generic_timer.cc') diff --git a/src/dev/arm/generic_timer.cc b/src/dev/arm/generic_timer.cc index 350867488..f8433bd2d 100644 --- a/src/dev/arm/generic_timer.cc +++ b/src/dev/arm/generic_timer.cc @@ -385,7 +385,7 @@ GenericTimer::setMiscReg(int reg, unsigned cpu, MiscReg val) case MISCREG_CNTPS_CVAL_EL1: case MISCREG_CNTPS_TVAL_EL1: case MISCREG_CNTPS_CTL_EL1: - /* FALLTHROUGH */ + M5_FALLTHROUGH; // PL2 phys. timer, non-secure case MISCREG_CNTHCTL: @@ -466,7 +466,7 @@ GenericTimer::readMiscReg(int reg, unsigned cpu) case MISCREG_CNTPS_CVAL_EL1: case MISCREG_CNTPS_TVAL_EL1: case MISCREG_CNTPS_CTL_EL1: - /* FALLTHROUGH */ + M5_FALLTHROUGH; // PL2 phys. timer, non-secure case MISCREG_CNTHCTL: -- cgit v1.2.3