Gabe Black has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/23321 )

Change subject: fastmodel: Switch the diagnostic pragmas to GCC from clang.
......................................................................

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
---
M src/arch/arm/fastmodel/GIC/gic.hh
M src/arch/arm/fastmodel/amba_from_tlm_bridge.hh
M src/arch/arm/fastmodel/amba_ports.hh
M src/arch/arm/fastmodel/amba_to_tlm_bridge.hh
M src/arch/arm/fastmodel/common/signal_receiver.hh
5 files changed, 15 insertions(+), 15 deletions(-)



diff --git a/src/arch/arm/fastmodel/GIC/gic.hh b/src/arch/arm/fastmodel/GIC/gic.hh
index 15abba9..24f0906 100644
--- 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 b57a4c6..efab110 100644
--- 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 e895da1..a66a896 100644
--- 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 e714e1e..805abc0 100644
--- 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 2a92225..3148128 100644
--- 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>


--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/23321
To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ie9f2789f45706223b11ed5acdf8b371de6e7ee24
Gerrit-Change-Number: 23321
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to