projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
tcmalloc
/
chromium
/
src
/
system-alloc.cc
diff --git
a/src/third_party/tcmalloc/chromium/src/system-alloc.cc
b/src/third_party/tcmalloc/chromium/src/system-alloc.cc
index
2141d41
..
d1ae71d
100644
(file)
--- a/
src/third_party/tcmalloc/chromium/src/system-alloc.cc
+++ b/
src/third_party/tcmalloc/chromium/src/system-alloc.cc
@@
-100,7
+100,7
@@
template <> bool CheckAddressBits<8 * sizeof(void*)>(uintptr_t ptr) {
return true;
}
-#if
(defined(OS_LINUX) || defined(OS_CHROMEOS)
) && defined(__x86_64__)
+#if
defined(OS_LINUX
) && defined(__x86_64__)
#define ASLR_IS_SUPPORTED
#endif