diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/base/process | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/base/process')
| -rw-r--r-- | chromium/base/process/launch_posix.cc | 4 | ||||
| -rw-r--r-- | chromium/base/process/memory_linux.cc | 28 | ||||
| -rw-r--r-- | chromium/base/process/memory_mac.mm | 2 |
3 files changed, 3 insertions, 31 deletions
diff --git a/chromium/base/process/launch_posix.cc b/chromium/base/process/launch_posix.cc index c4961900381..99582f59cfc 100644 --- a/chromium/base/process/launch_posix.cc +++ b/chromium/base/process/launch_posix.cc @@ -738,7 +738,7 @@ NOINLINE pid_t CloneAndLongjmpInChild(unsigned long flags, // fork-like behavior. char stack_buf[PTHREAD_STACK_MIN] ALIGNAS(16); #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \ - defined(ARCH_CPU_MIPS64_FAMILY) || defined(ARCH_CPU_MIPS_FAMILY) + defined(ARCH_CPU_MIPS_FAMILY) // The stack grows downward. void* stack = stack_buf + sizeof(stack_buf); #else @@ -772,7 +772,7 @@ pid_t ForkWithFlags(unsigned long flags, pid_t* ptid, pid_t* ctid) { #if defined(ARCH_CPU_X86_64) return syscall(__NR_clone, flags, nullptr, ptid, ctid, nullptr); #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \ - defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_MIPS64_FAMILY) + defined(ARCH_CPU_MIPS_FAMILY) // CONFIG_CLONE_BACKWARDS defined. return syscall(__NR_clone, flags, nullptr, ptid, nullptr, ctid); #else diff --git a/chromium/base/process/memory_linux.cc b/chromium/base/process/memory_linux.cc index 58e6174f58e..9fb630b4750 100644 --- a/chromium/base/process/memory_linux.cc +++ b/chromium/base/process/memory_linux.cc @@ -217,31 +217,3 @@ bool UncheckedMalloc(size_t size, void** result) { } } // namespace base - -// This is a workaround for crbug.com/598075. This code never existed in trunk. -// The problem is that some x86 Android device vendors forgot to provide the -// posix_memalign symbol in libc even though it is mandated by the NDK. -// This causes Chrome to crash at load-time, due to the unresolved dependency. -// Fortunately it is farily easy to reimplement ourselves posix_memalign on -// top of memalign. -// This is not a problem in trunk after http://crrev.com/1875043003. -#if defined(OS_ANDROID) && defined(ARCH_CPU_X86) -#include <errno.h> -#include <malloc.h> - -extern "C" { -__attribute__((visibility("default"))) int posix_memalign(void** res, - size_t alignment, - size_t size) { - // posix_memalign is supposed to check the arguments. See tc_posix_memalign() - // in tc_malloc.cc. - if (((alignment % sizeof(void*)) != 0) || - ((alignment & (alignment - 1)) != 0) || (alignment == 0)) { - return EINVAL; - } - void* ptr = memalign(alignment, size); - *res = ptr; - return ptr ? 0 : ENOMEM; -} -} // extern "C" -#endif diff --git a/chromium/base/process/memory_mac.mm b/chromium/base/process/memory_mac.mm index b70e37092bc..db51fb5098d 100644 --- a/chromium/base/process/memory_mac.mm +++ b/chromium/base/process/memory_mac.mm @@ -252,7 +252,7 @@ bool CanGetContextForCFAllocator() { } CFAllocatorContext* ContextForCFAllocator(CFAllocatorRef allocator) { - if (base::mac::IsOSLion() || base::mac::IsOSMountainLion() || + if (base::mac::IsOSMountainLion() || base::mac::IsOSMavericks() || base::mac::IsOSYosemite() || base::mac::IsOSElCapitan()) { ChromeCFAllocatorLions* our_allocator = |