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

Unified Diff: base/allocator/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
« no previous file with comments | « no previous file | build/config/BUILDCONFIG.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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",
« no previous file with comments | « no previous file | build/config/BUILDCONFIG.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698