diff options
| author | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-09-19 01:34:03 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | 2014-09-19 01:34:03 +0000 |
| commit | c5ff406f5f5346baa4c1827daa5c3a2814127cc8 (patch) | |
| tree | cd80641d3508f052bd9282ca2382020ceaba6ea4 /compiler-rt/lib/builtins/assembly.h | |
| parent | 5b6fa2f85acd2035a709b8c65a734e28e9d0772f (diff) | |
| download | bcm5719-llvm-c5ff406f5f5346baa4c1827daa5c3a2814127cc8.tar.gz bcm5719-llvm-c5ff406f5f5346baa4c1827daa5c3a2814127cc8.zip | |
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.
llvm-svn: 218095
Diffstat (limited to 'compiler-rt/lib/builtins/assembly.h')
| -rw-r--r-- | compiler-rt/lib/builtins/assembly.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/compiler-rt/lib/builtins/assembly.h b/compiler-rt/lib/builtins/assembly.h index 6a853dc753d..6dbb6ed6219 100644 --- a/compiler-rt/lib/builtins/assembly.h +++ b/compiler-rt/lib/builtins/assembly.h @@ -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 |
