imported patch aux-fix.patch

2 files changed, 7 insertions, 11 deletions

diff --git a/src/sim/process.cc b/src/sim/process.cc
index 244fb9297..a1f4c7d1d 100644
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -87,14 +87,14 @@ using namespace TheISA;
 int num_processes = 0;
 
 template<class IntType>
-M5_auxv_t<IntType>::M5_auxv_t(IntType type, IntType val)
+AuxVector<IntType>::AuxVector(IntType type, IntType val)
 {
     a_type = TheISA::htog(type);
     a_val = TheISA::htog(val);
 }
 
-template class M5_auxv_t<uint32_t>;
-template class M5_auxv_t<uint64_t>;
+template class AuxVector<uint32_t>;
+template class AuxVector<uint64_t>;
 
 Process::Process(ProcessParams * params)
     : SimObject(params), system(params->system), checkpointRestored(false),
diff --git a/src/sim/process.hh b/src/sim/process.hh
index 996663847..e6b7c80b7 100644
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -62,19 +62,15 @@ namespace TheISA
 }
 
 template<class IntType>
-struct M5_auxv_t
+struct AuxVector
 {
     IntType a_type;
-    union {
-        IntType a_val;
-        IntType a_ptr;
-        IntType a_fcn;
-    };
+    IntType a_val;
 
-    M5_auxv_t()
+    AuxVector()
     {}
 
-    M5_auxv_t(IntType type, IntType val);
+    AuxVector(IntType type, IntType val);
 };
 
 class Process : public SimObject