diff -r 5f9e1e0ee1d9 -r 6d2f8d64fac3 src/sim/byteswap.hh
--- a/src/sim/byteswap.hh	Sat Sep 10 03:50:35 2011 -0700
+++ b/src/sim/byteswap.hh	Sun Sep 11 17:48:06 2011 -0700
@@ -167,7 +167,8 @@
 
 namespace BigEndianGuest
 {
-    const bool ByteOrderDiffers = (HostByteOrder != BigEndianByteOrder);
+    const ByteOrder GuestByteOrder = BigEndianByteOrder;
+    const bool ByteOrderDiffers = (HostByteOrder != GuestByteOrder);
     template <typename T>
     inline T gtole(T value) {return betole(value);}
     template <typename T>
@@ -184,7 +185,8 @@
 
 namespace LittleEndianGuest
 {
-    const bool ByteOrderDiffers = (HostByteOrder != LittleEndianByteOrder);
+    const ByteOrder GuestByteOrder = LittleEndianByteOrder;
+    const bool ByteOrderDiffers = (HostByteOrder != GuestByteOrder);
     template <typename T>
     inline T gtole(T value) {return value;}
     template <typename T>