* armvirt.c (ABORTS): Do not define.

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index b4ab3a4f798aa9202b5d5eeac911b222f6497191..7a436de0f98024f777c70156653b3d4e44dad38a 100644 (file)
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,5 +1,7 @@
 2000-07-04  Alexandre Oliva  <aoliva@redhat.com>
 
+       * armvirt.c (ABORTS): Do not define.
+
        * armdefs.h (struct ARMul_State): Add is_StrongARM.
        (ARM_Strong_Prop, STRONGARM): Define.
        * arminit.c (ARMul_NewState): Reset is_StrongARM.

diff --git a/sim/arm/armvirt.c b/sim/arm/armvirt.c
index 38f0083d2d8df7eb73088460394f5cb03d882632..f9ac453a36306ed49a857056434e04681d95be63 100644 (file)
--- a/sim/arm/armvirt.c
+++ b/sim/arm/armvirt.c
@@ -32,7 +32,7 @@ defined to generate aborts. */
 #define ABORTS 1
 #endif
 
-#define ABORTS
+/* #define ABORTS */
 
 #ifdef ABORTS                  /* the memory system will abort */
 /* For the old test suite Abort between 32 Kbytes and 32 Mbytes