diff options
| author | Gabe Black <gabeblack@google.com> | 2019-12-03 06:04:15 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2019-12-03 20:33:36 +0000 |
| commit | ce83321dfc8cbaad4ce7d62410f5e3c3551e5966 (patch) | |
| tree | 27620a7ad75a76c07bc3d90cc487e6bbb247655f /src/arch/arm | |
| parent | 31b965b4f7fadb79aab8639af878fd2babde9bdd (diff) | |
| download | gem5-ce83321dfc8cbaad4ce7d62410f5e3c3551e5966.tar.xz | |
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>
Diffstat (limited to 'src/arch/arm')
| -rw-r--r-- | src/arch/arm/fastmodel/GIC/gic.hh | 6 | ||||
| -rw-r--r-- | src/arch/arm/fastmodel/amba_from_tlm_bridge.hh | 6 | ||||
| -rw-r--r-- | src/arch/arm/fastmodel/amba_ports.hh | 6 | ||||
| -rw-r--r-- | src/arch/arm/fastmodel/amba_to_tlm_bridge.hh | 6 | ||||
| -rw-r--r-- | src/arch/arm/fastmodel/common/signal_receiver.hh | 6 |
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 15abba94c..24f0906ba 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 b57a4c63b..efab110d7 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 e895da1ee..a66a89600 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 e714e1e86..805abc0b7 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 2a922256e..314812890 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> |