From 8d38dd32311468254c0839ae8f0797f3f824df05 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Mon, 12 Mar 2007 17:23:08 -0400
Subject: [PATCH] remove the extern C around gdb helper functions. It's need
 needed for any new version of gdb to work and it causes at least mine to
 segfault

--HG--
extra : convert_revision : 5e4c2ec753372fd0569734d3ddb0c8690409ca16
---
 src/base/trace.cc   | 32 +++++++++++++++-----------------
 src/cpu/pc_event.cc |  2 --
 src/sim/eventq.cc   |  1 -
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/base/trace.cc b/src/base/trace.cc
index 2dde1f688..0a7e6e833 100644
--- a/src/base/trace.cc
+++ b/src/base/trace.cc
@@ -192,22 +192,20 @@ dumpStatus()
 
 
 // add a set of functions that can easily be invoked from gdb
-extern "C" {
-    void
-    setTraceFlag(const char *string)
-    {
-        Trace::changeFlag(string, true);
-    }
+void
+setTraceFlag(const char *string)
+{
+    Trace::changeFlag(string, true);
+}
 
-    void
-    clearTraceFlag(const char *string)
-    {
-        Trace::changeFlag(string, false);
-    }
+void
+clearTraceFlag(const char *string)
+{
+    Trace::changeFlag(string, false);
+}
 
-    void
-    dumpTraceStatus()
-    {
-        Trace::dumpStatus();
-    }
-/* extern "C" */ }
+void
+dumpTraceStatus()
+{
+    Trace::dumpStatus();
+}
diff --git a/src/cpu/pc_event.cc b/src/cpu/pc_event.cc
index 7ab8bfcb8..438218df2 100644
--- a/src/cpu/pc_event.cc
+++ b/src/cpu/pc_event.cc
@@ -138,14 +138,12 @@ BreakPCEvent::process(ThreadContext *tc)
 }
 
 #if FULL_SYSTEM
-extern "C"
 void
 sched_break_pc_sys(System *sys, Addr addr)
 {
     new BreakPCEvent(&sys->pcEventQueue, "debug break", addr, true);
 }
 
-extern "C"
 void
 sched_break_pc(Addr addr)
 {
diff --git a/src/sim/eventq.cc b/src/sim/eventq.cc
index bcd0d3df3..65e115256 100644
--- a/src/sim/eventq.cc
+++ b/src/sim/eventq.cc
@@ -222,7 +222,6 @@ EventQueue::dump()
     cprintf("============================================================\n");
 }
 
-extern "C"
 void
 dumpMainQueue()
 {