[compiler-rt] r218095 - builtins: remove definition of __ARM_ARCH

[Saleem Abdulrasool]

Author: compnerd
Date: Thu Sep 18 20:34:03 2014
New Revision: 218095

URL: http://llvm.org/viewvc/llvm-project?rev=218095&view=rev
Log:
builtins: remove definition of __ARM_ARCH

__ARM_ARCH is part of the ACLE specification.  At least clang and GCC have
supported this part of the ACLE for some time now.  Let the compiler provide the
proper definition for the macro rather than try to guess it.

Modified:
    compiler-rt/trunk/lib/builtins/assembly.h

Modified: compiler-rt/trunk/lib/builtins/assembly.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/builtins/assembly.h?rev=218095&r1=218094&r2=218095&view=diff
==============================================================================
--- compiler-rt/trunk/lib/builtins/assembly.h (original)
+++ compiler-rt/trunk/lib/builtins/assembly.h Thu Sep 18 20:34:03 2014
@@ -49,33 +49,6 @@
 #endif
 
 #if defined(__arm__)
-#ifndef __ARM_ARCH
-#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) ||                     \
-    defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) ||                    \
-    defined(__ARM_ARCH_7EM__)
-#define __ARM_ARCH 7
-#endif
-#endif
-
-#ifndef __ARM_ARCH
-#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) ||                     \
-    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) ||                    \
-    defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6ZM__)
-#define __ARM_ARCH 6
-#endif
-#endif
-
-#ifndef __ARM_ARCH
-#if defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) ||                     \
-    defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__)
-#define __ARM_ARCH 5
-#endif
-#endif
-
-#ifndef __ARM_ARCH
-#define __ARM_ARCH 4
-#endif
-
 #if defined(__ARM_ARCH_4T__) || __ARM_ARCH >= 5
 #define ARM_HAS_BX
 #endif