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. |