From: Hoa Nguyen <hoanguyen@ucdavis.edu>
Date: Mon, 20 Jul 2020 23:59:49 +0000 (-0700)
Subject: systemc: Fix systemc array bound error
X-Git-Tag: v20.1.0.0~408
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9058c409087c239133135e13e8efb8bfbc429382;p=gem5.git

systemc: Fix systemc array bound error

Currently, gcc 10.0 does not compile gem5 due to an array bound error
in sc_unsigned and sc_signed constructors.

Previous fix only ignores array-bounds warnings for sc_unsigned.cc and
sc_signed for gcc 10.1 onwards.

This commit turns the ignoring array-bounds warning flag on for all
gcc 10 onwards.

JIRA: https://gem5.atlassian.net/browse/GEM5-677.

Change-Id: Id65b6d52cef527f62917e09231ff79e2237affd8
Signed-off-by: Hoa Nguyen <hoanguyen@ucdavis.edu>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31634
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/systemc/dt/int/SConscript b/src/systemc/dt/int/SConscript
index 26bb6aeb3..92c0f0711 100644
--- a/src/systemc/dt/int/SConscript
+++ b/src/systemc/dt/int/SConscript
@@ -28,7 +28,7 @@ Import('*')
 from m5.util import compareVersions
 
 if env['USE_SYSTEMC']:
-    if main['GCC'] and compareVersions(main['GCC_VERSION'], '10.1') >= 0:
+    if main['GCC'] and compareVersions(main['GCC_VERSION'], '10.0') >= 0:
         disable_false_positives = {
             "CCFLAGS": [ "-Wno-array-bounds",
                          "-Wno-stringop-overflow" ]