Fix up #defines to use full path; fix up code for g++ 3.4
SConscript:
Remove efence option from automatically being used.
--HG--
extra : convert_revision : 466bb8077aa341db0b409720e2a73535b1fa6b69
This commit is contained in:
@@ -12,14 +12,11 @@
|
||||
// Probably not a big deal if the IPR stuff isn't cycle accurate. Can just
|
||||
// have the original function handle writing to the IPR register.
|
||||
|
||||
#ifndef __SIMPLE_COMMIT_HH__
|
||||
#define __SIMPLE_COMMIT_HH__
|
||||
#ifndef __CPU_BETA_CPU_SIMPLE_COMMIT_HH__
|
||||
#define __CPU_BETA_CPU_SIMPLE_COMMIT_HH__
|
||||
|
||||
//#include "arch/alpha/isa_traits.hh"
|
||||
#include "base/statistics.hh"
|
||||
#include "base/timebuf.hh"
|
||||
//#include "cpu/beta_cpu/comm.hh"
|
||||
//#include "cpu/beta_cpu/rename_map.hh"
|
||||
//#include "cpu/beta_cpu/rob.hh"
|
||||
#include "mem/memory_interface.hh"
|
||||
|
||||
template<class Impl>
|
||||
@@ -157,4 +154,4 @@ class SimpleCommit
|
||||
Stats::Distribution<> n_committed_dist;
|
||||
};
|
||||
|
||||
#endif // __SIMPLE_COMMIT_HH__
|
||||
#endif // __CPU_BETA_CPU_SIMPLE_COMMIT_HH__
|
||||
|
||||
Reference in New Issue
Block a user