| Index: src/arm/simulator-arm.h
 | 
| ===================================================================
 | 
| --- src/arm/simulator-arm.h	(revision 5614)
 | 
| +++ src/arm/simulator-arm.h	(working copy)
 | 
| @@ -38,7 +38,7 @@
 | 
|  
 | 
|  #include "allocation.h"
 | 
|  
 | 
| -#if defined(__arm__)
 | 
| +#if defined(__arm__) && !defined(USE_SIMULATOR)
 | 
|  
 | 
|  // When running without a simulator we call the entry directly.
 | 
|  #define CALL_GENERATED_CODE(entry, p0, p1, p2, p3, p4) \
 | 
| @@ -70,7 +70,7 @@
 | 
|    reinterpret_cast<TryCatch*>(try_catch_address)
 | 
|  
 | 
|  
 | 
| -#else  // defined(__arm__)
 | 
| +#else  // !defined(__arm__) || defined(USE_SIMULATOR)
 | 
|  
 | 
|  // When running with the simulator transition into simulated execution at this
 | 
|  // point.
 | 
| @@ -356,6 +356,6 @@
 | 
|  };
 | 
|  
 | 
|  
 | 
| -#endif  // defined(__arm__)
 | 
| +#endif  // !defined(__arm__) || defined(USE_SIMULATOR)
 | 
|  
 | 
|  #endif  // V8_ARM_SIMULATOR_ARM_H_
 | 
| 
 |