Commit 48de5ae1 authored by Sean McAllister's avatar Sean McAllister Committed by Commit Bot

Refactor OS_LINUX preprocessor directive for LaCrOS effort.

Currently, ChromeOS defines the OS_LINUX directive as well as
OS_CHROMEOS.  We're working to separate these two, so we're
making the fact that OS_LINUX == OS_LINUX || OS_CHROMEOS
explicit.

This is changes for /third_party/tcmalloc

This CL was uploaded by git cl split.

R=wfh@chromium.org

Bug: 1110266
Change-Id: I81296204a0e3914e22cb8fbfa3c07688c6fb63a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2370734Reviewed-by: default avatarWill Harris <wfh@chromium.org>
Commit-Queue: Will Harris <wfh@chromium.org>
Auto-Submit: Sean McAllister <smcallis@google.com>
Cr-Commit-Position: refs/heads/master@{#801063}
parent 6895b522
......@@ -122,3 +122,4 @@ Modifications:
- Include <atomic> in malloc_extension.h due to std::atomic usage
- Precompute the pointer mask for doubly linked free lists instead of computing it on each access.
- Move spinlock to function static variable to fix static initializer check error.
- Enable ASLR support on both Linux and ChromeOS
\ No newline at end of file
......@@ -109,7 +109,7 @@ static bool CheckAddressBits(uintptr_t ptr) {
namespace {
#if defined(OS_LINUX) && defined(__x86_64__)
#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(__x86_64__)
#define ASLR_IS_SUPPORTED
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment