Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(346)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: include/core/SkPreConfig.h

Issue 314643004: SK_CPU_ARM --> SK_CPU_ARM32 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/core/SkPostConfig.h ('k') | src/core/SkUtilsArm.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkPreConfig_DEFINED 10 #ifndef SkPreConfig_DEFINED
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 #elif _M_IX86_FP == 1 155 #elif _M_IX86_FP == 1
156 #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE1 156 #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE1
157 #endif 157 #endif
158 #endif 158 #endif
159 #endif 159 #endif
160 160
161 ////////////////////////////////////////////////////////////////////// 161 //////////////////////////////////////////////////////////////////////
162 // ARM defines 162 // ARM defines
163 163
164 #if defined(__arm__) && (!defined(__APPLE__) || !TARGET_IPHONE_SIMULATOR) 164 #if defined(__arm__) && (!defined(__APPLE__) || !TARGET_IPHONE_SIMULATOR)
165 #define SK_CPU_ARM 165 #define SK_CPU_ARM32
166 166
167 #if defined(__GNUC__) 167 #if defined(__GNUC__)
168 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ 168 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \
169 || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ 169 || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \
170 || defined(__ARM_ARCH_7EM__) || defined(_ARM_ARCH_7) 170 || defined(__ARM_ARCH_7EM__) || defined(_ARM_ARCH_7)
171 #define SK_ARM_ARCH 7 171 #define SK_ARM_ARCH 7
172 #elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ 172 #elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \
173 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \ 173 || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) \
174 || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \ 174 || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) \
175 || defined(__ARM_ARCH_6M__) || defined(_ARM_ARCH_6) 175 || defined(__ARM_ARCH_6M__) || defined(_ARM_ARCH_6)
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 * 255 *
256 * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute. 256 * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute.
257 */ 257 */
258 #if SK_HAS_ATTRIBUTE(optimize) 258 #if SK_HAS_ATTRIBUTE(optimize)
259 # define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1"))) 259 # define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1")))
260 #else 260 #else
261 # define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */ 261 # define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */
262 #endif 262 #endif
263 263
264 #endif 264 #endif
OLDNEW
« no previous file with comments | « include/core/SkPostConfig.h ('k') | src/core/SkUtilsArm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698