fastmodel: Switch the diagnostic pragmas to GCC from clang.

Clang can handle both, and GCC throws a fit if it sees pragmas for
clang.

Change-Id: Ie9f2789f45706223b11ed5acdf8b371de6e7ee24
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23321
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/arch/arm/fastmodel/GIC/gic.hh b/src/arch/arm/fastmodel/GIC/gic.hh
index 15abba94c52a7125cc2a1bd0f3dbdfd3b8ed27ce..24f0906ba9267ec7b3196c6f4cd325c50c2f00c4 100644 (file)
--- a/src/arch/arm/fastmodel/GIC/gic.hh
+++ b/src/arch/arm/fastmodel/GIC/gic.hh
@@ -30,10 +30,10 @@
 #ifndef __ARCH_ARM_FASTMODEL_GIC_GIC_HH__
 #define __ARCH_ARM_FASTMODEL_GIC_GIC_HH__
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Woverloaded-virtual"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
 #include <amba_pv.h>
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 
 #include <memory>
 

diff --git a/src/arch/arm/fastmodel/amba_from_tlm_bridge.hh b/src/arch/arm/fastmodel/amba_from_tlm_bridge.hh
index b57a4c63bb30d6bf109e60daced93c0195a38db6..efab110d7fd843fec7fa11818d972b36d02658e2 100644 (file)
--- a/src/arch/arm/fastmodel/amba_from_tlm_bridge.hh
+++ b/src/arch/arm/fastmodel/amba_from_tlm_bridge.hh
@@ -30,10 +30,10 @@
 #ifndef __ARCH_ARM_FASTMODEL_AMBA_FROM_TLM_BRIDGE_HH__
 #define __ARCH_ARM_FASTMODEL_AMBA_FROM_TLM_BRIDGE_HH__
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Woverloaded-virtual"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
 #include "amba_pv.h"
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 #include "arch/arm/fastmodel/amba_ports.hh"
 #include "systemc/tlm_port_wrapper.hh"
 

diff --git a/src/arch/arm/fastmodel/amba_ports.hh b/src/arch/arm/fastmodel/amba_ports.hh
index e895da1eebc9b51547c6d8562f176c5706d88a1b..a66a89600683e32f741664ff0fc1780351ac2a40 100644 (file)
--- a/src/arch/arm/fastmodel/amba_ports.hh
+++ b/src/arch/arm/fastmodel/amba_ports.hh
@@ -30,10 +30,10 @@
 #ifndef __ARCH_ARM_FASTMODEL_AMBA_PORTS_HH__
 #define __ARCH_ARM_FASTMODEL_AMBA_PORTS_HH__
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Woverloaded-virtual"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
 #include <amba_pv.h>
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 
 #include "systemc/tlm_port_wrapper.hh"
 

diff --git a/src/arch/arm/fastmodel/amba_to_tlm_bridge.hh b/src/arch/arm/fastmodel/amba_to_tlm_bridge.hh
index e714e1e86597925e03c85c1a7f682082631dd858..805abc0b73d97bc4814886cbf934e6b47c334d2f 100644 (file)
--- a/src/arch/arm/fastmodel/amba_to_tlm_bridge.hh
+++ b/src/arch/arm/fastmodel/amba_to_tlm_bridge.hh
@@ -30,10 +30,10 @@
 #ifndef __ARCH_ARM_FASTMODEL_AMBA_TO_TLM_BRIDGE_HH__
 #define __ARCH_ARM_FASTMODEL_AMBA_TO_TLM_BRIDGE_HH__
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Woverloaded-virtual"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
 #include "amba_pv.h"
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 #include "arch/arm/fastmodel/amba_ports.hh"
 #include "systemc/tlm_port_wrapper.hh"
 

diff --git a/src/arch/arm/fastmodel/common/signal_receiver.hh b/src/arch/arm/fastmodel/common/signal_receiver.hh
index 2a922256ec209eb2dbd093b4ef4c1c58978c0bfb..3148128909e4e49c63623beffe075f46a988b766 100644 (file)
--- a/src/arch/arm/fastmodel/common/signal_receiver.hh
+++ b/src/arch/arm/fastmodel/common/signal_receiver.hh
@@ -30,10 +30,10 @@
 #ifndef __ARCH_ARM_FASTMODEL_COMMON_SIGNAL_RECEIVER_HH__
 #define __ARCH_ARM_FASTMODEL_COMMON_SIGNAL_RECEIVER_HH__
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Woverloaded-virtual"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
 #include <amba_pv.h>
-#pragma clang diagnostic pop
+#pragma GCC diagnostic pop
 
 #include <functional>