From: Gabe Black <gabeblack@google.com>
Date: Mon, 10 Feb 2020 04:03:58 +0000 (-0800)
Subject: scons: Disable some warnings in clang.
X-Git-Tag: v20.0.0.0~12
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92711fe8e9d14e63a047cbd48e978533fcb7c6ed;p=gem5.git

scons: Disable some warnings in clang.

The defaulted-function-deleted warning triggers in generated code which
would be very tricky to address.

The c99-designator refers to using an array index to specify which
element of an array is being initialized. This makes the code more
clear and is supported by both g++ and clang++. Designated initializers
for structures are being introduced in C++20, but there is no word I
could find on arrays. This warning option seems to only exist in clang
versions 10 and up, so we can only use it on those versions.

Change-Id: I8fb858e643814638c552a49336db2672be8e43c8
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29396
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/SConstruct b/SConstruct
index 82fad3b95..142800e60 100755
--- a/SConstruct
+++ b/SConstruct
@@ -475,7 +475,10 @@ elif main['CLANG']:
                          # use struct hash and class hash
                          # interchangeably.
                          '-Wno-mismatched-tags',
+                         '-Wno-defaulted-function-deleted',
                          ])
+    if compareVersions(clang_version, "10.0") >= 0:
+        main.Append(CCFLAGS=['-Wno-c99-designator'])
 
     main.Append(TCMALLOC_CCFLAGS=['-fno-builtin'])