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

Unified Diff: build/config/compiler/BUILD.gn

Issue 2518423002: Fix tcmalloc arm clang build (Closed)
Patch Set: . Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« base/allocator/BUILD.gn ('K') | « build/config/BUILDCONFIG.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 08585b8539a3159819212a46802edd707fe586e7..289df8a8223ef4d23e22f8b305b50ed7fe43c3bf 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -537,6 +537,13 @@ config("compiler_cpu_abi") {
"-march=$arm_arch",
"-mfloat-abi=$arm_float_abi",
]
+ if (arm_use_thumb) {
+ cflags += [ "-mthumb" ]
+ if (is_android && !is_clang) {
+ # Clang doesn't support this option.
+ cflags += [ "-mthumb-interwork" ]
+ }
+ }
}
if (arm_tune != "") {
cflags += [ "-mtune=$arm_tune" ]
@@ -761,17 +768,6 @@ config("compiler_arm_fpu") {
}
}
-config("compiler_arm_thumb") {
- if (current_cpu == "arm" && arm_use_thumb && is_posix &&
- !(is_mac || is_ios || is_nacl)) {
- cflags = [ "-mthumb" ]
- if (is_android && !is_clang) {
- # Clang doesn't support this option.
- cflags += [ "-mthumb-interwork" ]
- }
- }
-}
-
# runtime_library -------------------------------------------------------------
#
# Sets the runtime library and associated options.
« base/allocator/BUILD.gn ('K') | « build/config/BUILDCONFIG.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698