summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2010-06-02 12:58:03 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2010-06-02 12:58:03 -0500
commit8fadf2691d8e2724c1bd175c2f505786a50bf12e (patch)
tree26567b461fcb2da18b697cd1541638fccd7a38c5
parentf18040a20577a7eff4bde61055782568b291ee53 (diff)
downloadgem5-8fadf2691d8e2724c1bd175c2f505786a50bf12e.tar.xz
ARM: GCC < 4.3 has some issues with attribute no return on some functions. Fix so it works for older gccs.
-rw-r--r--src/arch/arm/isa/templates/basic.isa2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/arch/arm/isa/templates/basic.isa b/src/arch/arm/isa/templates/basic.isa
index c6a7566d3..843f90840 100644
--- a/src/arch/arm/isa/templates/basic.isa
+++ b/src/arch/arm/isa/templates/basic.isa
@@ -89,5 +89,7 @@ def template BasicExecPanic {{
Fault execute(%(CPU_exec_context)s *, Trace::InstRecord *) const
{
panic("Execute method called when it shouldn't!");
+ // GCC < 4.3 fail to recognize the above panic as no return
+ return NoFault;
}
}};