From f72d8a4de4ea341d841f813f4a226b0803ff4e51 Mon Sep 17 00:00:00 2001
From: "lrn@chromium.org"
 <lrn@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 25 Nov 2008 14:26:13 +0000
Subject: [PATCH] IA32-tests won't be compiled on ARM (and not just not run).

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@840 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 src/regexp-macro-assembler-ia32.cc |  1 -
 src/regexp-macro-assembler-ia32.h  |  2 +-
 test/cctest/cctest.h               |  9 ---------
 test/cctest/test-regexp.cc         | 11 +++++++----
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/regexp-macro-assembler-ia32.cc b/src/regexp-macro-assembler-ia32.cc
index 66c47836d8..dd4ff00b3f 100644
--- a/src/regexp-macro-assembler-ia32.cc
+++ b/src/regexp-macro-assembler-ia32.cc
@@ -318,7 +318,6 @@ void RegExpMacroAssemblerIA32::DispatchByteMap(
 }
 
 
-
 void RegExpMacroAssemblerIA32::DispatchHighByteMap(
     byte start,
     Label* byte_map,
diff --git a/src/regexp-macro-assembler-ia32.h b/src/regexp-macro-assembler-ia32.h
index a336a441e2..34410dbf73 100644
--- a/src/regexp-macro-assembler-ia32.h
+++ b/src/regexp-macro-assembler-ia32.h
@@ -28,7 +28,7 @@
 #ifndef REGEXP_MACRO_ASSEMBLER_IA32_H_
 #define REGEXP_MACRO_ASSEMBLER_IA32_H_
 
-#if !(defined __arm__ || defined __thumb__ || defined ARM)
+#if !(defined(ARM) || defined(__arm__) || defined(__thumb__))
 
 #include "regexp-macro-assembler.h"
 #include "macro-assembler-ia32.h"
diff --git a/test/cctest/cctest.h b/test/cctest/cctest.h
index 92f7aadd1a..d6d1ba3051 100644
--- a/test/cctest/cctest.h
+++ b/test/cctest/cctest.h
@@ -42,15 +42,6 @@
   static void Test##Name()
 #endif
 
-#if (defined __arm__ || defined __thumb__ || defined ARM)
-#define IA32TEST DISABLED_TEST
-#define ARMTEST TEST
-#else  // ia32
-#define IA32TEST TEST
-#define ARMTEST DISABLED_TEST
-#endif
-
-
 class CcTest {
  public:
   typedef void (TestFunction)();
diff --git a/test/cctest/test-regexp.cc b/test/cctest/test-regexp.cc
index 4decfee52c..8b1dd4f9d7 100644
--- a/test/cctest/test-regexp.cc
+++ b/test/cctest/test-regexp.cc
@@ -720,7 +720,9 @@ TEST(MacroAssembler) {
 }
 
 
-IA32TEST(MacroAssemblerIA32Success) {
+#if !(defined(ARM) || defined(__arm__) || defined(__thumb__))
+
+TEST(MacroAssemblerIA32Success) {
   typedef bool (*AsciiTest) (
       SeqAsciiString** base, int start_index, int end_index, int* captures);
 
@@ -756,7 +758,7 @@ IA32TEST(MacroAssemblerIA32Success) {
 }
 
 
-IA32TEST(MacroAssemblerIA32Simple) {
+TEST(MacroAssemblerIA32Simple) {
   typedef bool (*AsciiTest) (
       SeqAsciiString** base, int start_index, int end_index, int* captures);
 
@@ -812,7 +814,7 @@ IA32TEST(MacroAssemblerIA32Simple) {
 }
 
 
-IA32TEST(MacroAssemblerIA32Backtrack) {
+TEST(MacroAssemblerIA32Backtrack) {
   typedef bool (*AsciiTest) (
       SeqAsciiString** base, int start_index, int end_index, int* captures);
 
@@ -855,7 +857,7 @@ IA32TEST(MacroAssemblerIA32Backtrack) {
 }
 
 
-IA32TEST(MacroAssemblerIA32Registers) {
+TEST(MacroAssemblerIA32Registers) {
   typedef bool (*AsciiTest) (
       SeqAsciiString** base, int start_index, int end_index, int* captures);
 
@@ -952,6 +954,7 @@ IA32TEST(MacroAssemblerIA32Registers) {
   CHECK_EQ(9, output[4]);
 }
 
+#endif  // !(defined(ARM) || defined(__arm__) || defined(__thumb__))
 
 TEST(AddInverseToTable) {
   static const int kLimit = 1000;