Periodic merge of bleeding_edge to experimental code generator branch....

src/macro-assembler.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 10 matching lines @@
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef V8_MACRO_ASSEMBLER_H_
 #define V8_MACRO_ASSEMBLER_H_
 
-#if defined(ARM) || defined (__arm__) || defined(__thumb__)
+#ifdef ARM
 
 #include "constants-arm.h"
 #include "assembler.h"
 #include "assembler-arm.h"
 #include "assembler-arm-inl.h"
 #include "code.h"  // must be after assembler_*.h
 #include "macro-assembler-arm.h"
 
 #else  // ia32
 
 #include "assembler.h"
 #include "assembler-ia32.h"
 #include "assembler-ia32-inl.h"
 #include "code.h"  // must be after assembler_*.h
 #include "macro-assembler-ia32.h"
 
 #endif
 
 #endif  // V8_MACRO_ASSEMBLER_H_