Chromium Code Reviews| Index: base/allocator/BUILD.gn |
| diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn |
| index cffe6c28db26e8aabc191ad85b9e94a9f1f783e9..9f8eca5e1e391b49dcef467d5859894fda03b6f3 100644 |
| --- a/base/allocator/BUILD.gn |
| +++ b/base/allocator/BUILD.gn |
| @@ -73,6 +73,11 @@ config("tcmalloc_flags") { |
| # typedefs. |
| "-Wno-unused-private-field", |
| ] |
| + if (target_cpu == "arm") { |
| + # Temporarily disable clang's integrated assembler when building tcmalloc |
| + # TODO(https://llvm.org/bugs/show_bug.cgi?id=31058) |
| + cflags += [ "-fno-integrated-as" ] |
|
llozano
2016/11/22 19:42:53
I thought the option is -no-integrated-as but this
|
| + } |
| } else { |
| cflags = [] |
| } |
| @@ -216,13 +221,7 @@ if (use_allocator == "tcmalloc") { |
| "$tcmalloc_dir/src", |
| ] |
| - configs -= [ |
| - "//build/config/compiler:chromium_code", |
| - |
| - # Thumb mode disabled due to bug in clang integrated assembler |
| - # TODO(https://llvm.org/bugs/show_bug.cgi?id=31058) |
| - "//build/config/compiler:compiler_arm_thumb", |
| - ] |
| + configs -= [ "//build/config/compiler:chromium_code" ] |
| configs += [ |
| "//build/config/compiler:no_chromium_code", |
| ":tcmalloc_flags", |