summaryrefslogtreecommitdiff
path: root/src/arch/x86/miscregs.hh
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-09-24 17:39:56 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-09-24 17:39:56 -0700
commit418ddf43e645133b3693ab8bf2e56656efcf1ebf (patch)
treec88d688929d2f957e174248db793565ce8b3fc6b /src/arch/x86/miscregs.hh
parentdd277e0d8f1e0303a74a29bd729864a4766e6f73 (diff)
downloadgem5-418ddf43e645133b3693ab8bf2e56656efcf1ebf.tar.xz
X86: Get X86_FS to compile.
--HG-- extra : convert_revision : fb973bcf13648876d5691231845dd47a2be50f01
Diffstat (limited to 'src/arch/x86/miscregs.hh')
-rw-r--r--src/arch/x86/miscregs.hh6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/arch/x86/miscregs.hh b/src/arch/x86/miscregs.hh
index bab813719..8080bd90b 100644
--- a/src/arch/x86/miscregs.hh
+++ b/src/arch/x86/miscregs.hh
@@ -61,6 +61,12 @@
#include "arch/x86/x86_traits.hh"
#include "base/bitunion.hh"
+//These get defined in some system headers (at least termbits.h). That confuses
+//things here significantly.
+#undef CR0
+#undef CR2
+#undef CR3
+
namespace X86ISA
{
enum CondFlagBit {