From 52b6764f31cab46204d5fdf6d0191428a8408bb1 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <steve.reinhardt@amd.com>
Date: Tue, 21 Apr 2009 08:17:36 -0700
Subject: syscall: Resolve conflicts between m5threads and Gabe's recent SE
 changes.

---
 src/arch/x86/isa_traits.hh | 1 +
 src/arch/x86/process.cc    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/arch/x86')

diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh
index d25e0eb70..09241c310 100644
--- a/src/arch/x86/isa_traits.hh
+++ b/src/arch/x86/isa_traits.hh
@@ -106,6 +106,7 @@ namespace X86ISA
     const int StackPointerReg = INTREG_RSP;
     //X86 doesn't seem to have a link register
     const int ReturnAddressReg = 0;
+    const int ReturnValueReg = INTREG_RAX;
     const int FramePointerReg = INTREG_RBP;
 
     // Some OS syscalls use a second register (rdx) to return a second
diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index 4a61ed168..43dd4a591 100644
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -104,7 +104,6 @@
 using namespace std;
 using namespace X86ISA;
 
-static const int ReturnValueReg = INTREG_RAX;
 static const int ArgumentReg[] = {
     INTREG_RDI,
     INTREG_RSI,
-- 
cgit v1.2.3