From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 00FD959CAF for ; Tue, 5 Apr 2016 20:30:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95D09E0898; Tue, 5 Apr 2016 20:30:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1AF31E0898 for ; Tue, 5 Apr 2016 20:30:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3682233BE05 for ; Tue, 5 Apr 2016 20:30:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A1D986 for ; Tue, 5 Apr 2016 20:29:56 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1459887998.b0a8c5d4509eca51aa961fea9fff7d439d80939b.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/files/, www-client/firefox/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/firefox/files/arm64-1-define-ARCH_CPU_ARM64.patch www-client/firefox/files/arm64-2-import-crbug-for-aarch64.patch www-client/firefox/files/arm64-3-set-WEBRTC_DETECT_ARM_NEON-when-optional.patch www-client/firefox/files/arm64-4-link-chromium-mutex-based-atomics.patch www-client/firefox/files/arm64-5-mozjemalloc-no-static-page-sizes.patch www-client/firefox/firefox-45.0.1-r1.ebuild www-client/firefox/firefox-45.0.1.ebuild X-VCS-Directories: www-client/firefox/files/ www-client/firefox/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: b0a8c5d4509eca51aa961fea9fff7d439d80939b X-VCS-Branch: master Date: Tue, 5 Apr 2016 20:29:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 22423750-53da-47fb-9665-e67f55958897 X-Archives-Hash: a5e30d8b6e2b814e082040dda65e9a2c commit: b0a8c5d4509eca51aa961fea9fff7d439d80939b Author: Ian Stakenvicius gentoo org> AuthorDate: Tue Apr 5 20:26:35 2016 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Tue Apr 5 20:26:38 2016 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=b0a8c5d4 Add patches to arm64 support, bug 577972 Currently these patches have just been pulled down from URLs in the bug. They need to be checked in bugzilla.mozilla.org and added to the patchset tarball for future versions. .../files/arm64-1-define-ARCH_CPU_ARM64.patch | 26 ++ .../files/arm64-2-import-crbug-for-aarch64.patch | 407 +++++++++++++++++++++ ...-set-WEBRTC_DETECT_ARM_NEON-when-optional.patch | 22 ++ ...arm64-4-link-chromium-mutex-based-atomics.patch | 59 +++ .../arm64-5-mozjemalloc-no-static-page-sizes.patch | 22 ++ ...efox-45.0.1.ebuild => firefox-45.0.1-r1.ebuild} | 5 + 6 files changed, 541 insertions(+) diff --git a/www-client/firefox/files/arm64-1-define-ARCH_CPU_ARM64.patch b/www-client/firefox/files/arm64-1-define-ARCH_CPU_ARM64.patch new file mode 100644 index 0000000..e47aafa --- /dev/null +++ b/www-client/firefox/files/arm64-1-define-ARCH_CPU_ARM64.patch @@ -0,0 +1,26 @@ +From: Makoto Kato +Date: Sun, 28 Feb 2016 19:26:18 +0900 +Subject: Bug 1250403 - Part 1. Define ARCH_CPU_ARM64 instead of + ARCH_CPU_AARCH64. r=billm + +Chromium defines ARCH_CPU_ARM64 and ARCH_CPU_ARM_FAMILY for aarch64. So we should use it instead. Because webrtc and sandbox already define it + +MozReview-Commit-ID: C7GYnpRryhA +--- + ipc/chromium/src/build/build_config.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h +index 7a4938e..dcec00d 100644 +--- a/ipc/chromium/src/build/build_config.h ++++ b/ipc/chromium/src/build/build_config.h +@@ -109,7 +109,8 @@ + #define ARCH_CPU_ALPHA 1 + #define ARCH_CPU_64_BITS 1 + #elif defined(__aarch64__) +-#define ARCH_CPU_AARCH64 1 ++#define ARCH_CPU_ARM_FAMILY 1 ++#define ARCH_CPU_ARM64 1 + #define ARCH_CPU_64_BITS 1 + #else + #error Please add support for your architecture in build/build_config.h diff --git a/www-client/firefox/files/arm64-2-import-crbug-for-aarch64.patch b/www-client/firefox/files/arm64-2-import-crbug-for-aarch64.patch new file mode 100644 index 0000000..1e3d7f3 --- /dev/null +++ b/www-client/firefox/files/arm64-2-import-crbug-for-aarch64.patch @@ -0,0 +1,407 @@ +From: Makoto Kato +Date: Sun, 28 Feb 2016 19:11:09 +0900 +Subject: Bug 1250403 - Part 2. Import crbug #354405 for aarch64. r=billm + +MozReview-Commit-ID: A3sArb6IE6m +--- + ipc/chromium/moz.build | 2 +- + ipc/chromium/src/base/atomicops.h | 4 +- + .../src/base/atomicops_internals_arm64_gcc.h | 360 +++++++++++++++++++++ + 3 files changed, 364 insertions(+), 2 deletions(-) + create mode 100644 ipc/chromium/src/base/atomicops_internals_arm64_gcc.h + +diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build +index 8b8e4cc..88aaafe 100644 +--- a/ipc/chromium/moz.build ++++ b/ipc/chromium/moz.build +@@ -162,7 +162,7 @@ if os_bsd or os_linux: + ] + + ost = CONFIG['OS_TEST'] +-if '86' not in ost and 'arm' not in ost and 'mips' not in ost: ++if '86' not in ost and 'arm' not in ost and 'aarch64' != ost and 'mips' not in ost: + SOURCES += [ + 'src/base/atomicops_internals_mutex.cc', + ] +diff --git a/ipc/chromium/src/base/atomicops.h b/ipc/chromium/src/base/atomicops.h +index a167541..f9ad55b 100644 +--- a/ipc/chromium/src/base/atomicops.h ++++ b/ipc/chromium/src/base/atomicops.h +@@ -138,8 +138,10 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); + #include "base/atomicops_internals_x86_macosx.h" + #elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY) + #include "base/atomicops_internals_x86_gcc.h" +-#elif defined(COMPILER_GCC) && defined(ARCH_CPU_ARM_FAMILY) ++#elif defined(COMPILER_GCC) && defined(ARCH_CPU_ARMEL) + #include "base/atomicops_internals_arm_gcc.h" ++#elif defined(COMPILER_GCC) && defined(ARCH_CPU_ARM64) ++#include "base/atomicops_internals_arm64_gcc.h" + #elif defined(COMPILER_GCC) && defined(ARCH_CPU_MIPS) + #include "base/atomicops_internals_mips_gcc.h" + #else +diff --git a/ipc/chromium/src/base/atomicops_internals_arm64_gcc.h b/ipc/chromium/src/base/atomicops_internals_arm64_gcc.h +new file mode 100644 +index 0000000..a2b0abc +--- /dev/null ++++ b/ipc/chromium/src/base/atomicops_internals_arm64_gcc.h +@@ -0,0 +1,360 @@ ++// Copyright 2014 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++// This file is an internal atomic implementation, use base/atomicops.h instead. ++ ++// TODO(rmcilroy): Investigate whether we can use __sync__ intrinsics instead of ++// the hand coded assembly without introducing perf regressions. ++// TODO(rmcilroy): Investigate whether we can use acquire / release versions of ++// exclusive load / store assembly instructions and do away with ++// the barriers. ++ ++#ifndef BASE_ATOMICOPS_INTERNALS_ARM64_GCC_H_ ++#define BASE_ATOMICOPS_INTERNALS_ARM64_GCC_H_ ++ ++#if defined(OS_QNX) ++#include ++#endif ++ ++namespace base { ++namespace subtle { ++ ++inline void MemoryBarrier() { ++ __asm__ __volatile__ ( // NOLINT ++ "dmb ish \n\t" // Data memory barrier. ++ ::: "memory" ++ ); // NOLINT ++} ++ ++ ++inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, ++ Atomic32 old_value, ++ Atomic32 new_value) { ++ Atomic32 prev; ++ int32_t temp; ++ ++ __asm__ __volatile__ ( // NOLINT ++ "0: \n\t" ++ "ldxr %w[prev], %[ptr] \n\t" // Load the previous value. ++ "cmp %w[prev], %w[old_value] \n\t" ++ "bne 1f \n\t" ++ "stxr %w[temp], %w[new_value], %[ptr] \n\t" // Try to store the new value. ++ "cbnz %w[temp], 0b \n\t" // Retry if it did not work. ++ "1: \n\t" ++ "clrex \n\t" // In case we didn't swap. ++ : [prev]"=&r" (prev), ++ [temp]"=&r" (temp), ++ [ptr]"+Q" (*ptr) ++ : [old_value]"r" (old_value), ++ [new_value]"r" (new_value) ++ : "memory", "cc" ++ ); // NOLINT ++ ++ return prev; ++} ++ ++inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, ++ Atomic32 new_value) { ++ Atomic32 result; ++ int32_t temp; ++ ++ __asm__ __volatile__ ( // NOLINT ++ "0: \n\t" ++ "ldxr %w[result], %[ptr] \n\t" // Load the previous value. ++ "stxr %w[temp], %w[new_value], %[ptr] \n\t" // Try to store the new value. ++ "cbnz %w[temp], 0b \n\t" // Retry if it did not work. ++ : [result]"=&r" (result), ++ [temp]"=&r" (temp), ++ [ptr]"+Q" (*ptr) ++ : [new_value]"r" (new_value) ++ : "memory" ++ ); // NOLINT ++ ++ return result; ++} ++ ++inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, ++ Atomic32 increment) { ++ Atomic32 result; ++ int32_t temp; ++ ++ __asm__ __volatile__ ( // NOLINT ++ "0: \n\t" ++ "ldxr %w[result], %[ptr] \n\t" // Load the previous value. ++ "add %w[result], %w[result], %w[increment]\n\t" ++ "stxr %w[temp], %w[result], %[ptr] \n\t" // Try to store the result. ++ "cbnz %w[temp], 0b \n\t" // Retry on failure. ++ : [result]"=&r" (result), ++ [temp]"=&r" (temp), ++ [ptr]"+Q" (*ptr) ++ : [increment]"r" (increment) ++ : "memory" ++ ); // NOLINT ++ ++ return result; ++} ++ ++inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, ++ Atomic32 increment) { ++ MemoryBarrier(); ++ Atomic32 result = NoBarrier_AtomicIncrement(ptr, increment); ++ MemoryBarrier(); ++ ++ return result; ++} ++ ++inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, ++ Atomic32 old_value, ++ Atomic32 new_value) { ++ Atomic32 prev; ++ int32_t temp; ++ ++ __asm__ __volatile__ ( // NOLINT ++ "0: \n\t" ++ "ldxr %w[prev], %[ptr] \n\t" // Load the previous value. ++ "cmp %w[prev], %w[old_value] \n\t" ++ "bne 1f \n\t" ++ "stxr %w[temp], %w[new_value], %[ptr] \n\t" // Try to store the new value. ++ "cbnz %w[temp], 0b \n\t" // Retry if it did not work. ++ "dmb ish \n\t" // Data memory barrier. ++ "1: \n\t" ++ // If the compare failed the 'dmb' is unnecessary, but we still need a ++ // 'clrex'. ++ "clrex \n\t" ++ : [prev]"=&r" (prev), ++ [temp]"=&r" (temp), ++ [ptr]"+Q" (*ptr) ++ : [old_value]"r" (old_value), ++ [new_value]"r" (new_value) ++ : "memory", "cc" ++ ); // NOLINT ++ ++ return prev; ++} ++ ++inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr, ++ Atomic32 old_value, ++ Atomic32 new_value) { ++ Atomic32 prev; ++ int32_t temp; ++ ++ MemoryBarrier(); ++ ++ __asm__ __volatile__ ( // NOLINT ++ "0: \n\t" ++ "ldxr %w[prev], %[ptr] \n\t" // Load the previous value. ++ "cmp %w[prev], %w[old_value] \n\t" ++ "bne 1f \n\t" ++ "stxr %w[temp], %w[new_value], %[ptr] \n\t" // Try to store the new value. ++ "cbnz %w[temp], 0b \n\t" // Retry if it did not work. ++ "1: \n\t" ++ // If the compare failed the we still need a 'clrex'. ++ "clrex \n\t" ++ : [prev]"=&r" (prev), ++ [temp]"=&r" (temp), ++ [ptr]"+Q" (*ptr) ++ : [old_value]"r" (old_value), ++ [new_value]"r" (new_value) ++ : "memory", "cc" ++ ); // NOLINT ++ ++ return prev; ++} ++ ++inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { ++ *ptr = value; ++} ++ ++inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { ++ *ptr = value; ++ MemoryBarrier(); ++} ++ ++inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { ++ MemoryBarrier(); ++ *ptr = value; ++} ++ ++inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { ++ return *ptr; ++} ++ ++inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { ++ Atomic32 value = *ptr; ++ MemoryBarrier(); ++ return value; ++} ++ ++inline Atomic32 Release_Load(volatile const Atomic32* ptr) { ++ MemoryBarrier(); ++ return *ptr; ++} ++ ++// 64-bit versions of the operations. ++// See the 32-bit versions for comments. ++ ++inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr, ++ Atomic64 old_value, ++ Atomic64 new_value) { ++ Atomic64 prev; ++ int32_t temp; ++ ++ __asm__ __volatile__ ( // NOLINT ++ "0: \n\t" ++ "ldxr %[prev], %[ptr] \n\t" ++ "cmp %[prev], %[old_value] \n\t" ++ "bne 1f \n\t" ++ "stxr %w[temp], %[new_value], %[ptr] \n\t" ++ "cbnz %w[temp], 0b \n\t" ++ "1: \n\t" ++ "clrex \n\t" ++ : [prev]"=&r" (prev), ++ [temp]"=&r" (temp), ++ [ptr]"+Q" (*ptr) ++ : [old_value]"r" (old_value), ++ [new_value]"r" (new_value) ++ : "memory", "cc" ++ ); // NOLINT ++ ++ return prev; ++} ++ ++inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr, ++ Atomic64 new_value) { ++ Atomic64 result; ++ int32_t temp; ++ ++ __asm__ __volatile__ ( // NOLINT ++ "0: \n\t" ++ "ldxr %[result], %[ptr] \n\t" ++ "stxr %w[temp], %[new_value], %[ptr] \n\t" ++ "cbnz %w[temp], 0b \n\t" ++ : [result]"=&r" (result), ++ [temp]"=&r" (temp), ++ [ptr]"+Q" (*ptr) ++ : [new_value]"r" (new_value) ++ : "memory" ++ ); // NOLINT ++ ++ return result; ++} ++ ++inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr, ++ Atomic64 increment) { ++ Atomic64 result; ++ int32_t temp; ++ ++ __asm__ __volatile__ ( // NOLINT ++ "0: \n\t" ++ "ldxr %[result], %[ptr] \n\t" ++ "add %[result], %[result], %[increment] \n\t" ++ "stxr %w[temp], %[result], %[ptr] \n\t" ++ "cbnz %w[temp], 0b \n\t" ++ : [result]"=&r" (result), ++ [temp]"=&r" (temp), ++ [ptr]"+Q" (*ptr) ++ : [increment]"r" (increment) ++ : "memory" ++ ); // NOLINT ++ ++ return result; ++} ++ ++inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, ++ Atomic64 increment) { ++ MemoryBarrier(); ++ Atomic64 result = NoBarrier_AtomicIncrement(ptr, increment); ++ MemoryBarrier(); ++ ++ return result; ++} ++ ++inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr, ++ Atomic64 old_value, ++ Atomic64 new_value) { ++ Atomic64 prev; ++ int32_t temp; ++ ++ __asm__ __volatile__ ( // NOLINT ++ "0: \n\t" ++ "ldxr %[prev], %[ptr] \n\t" ++ "cmp %[prev], %[old_value] \n\t" ++ "bne 1f \n\t" ++ "stxr %w[temp], %[new_value], %[ptr] \n\t" ++ "cbnz %w[temp], 0b \n\t" ++ "dmb ish \n\t" ++ "1: \n\t" ++ "clrex \n\t" ++ : [prev]"=&r" (prev), ++ [temp]"=&r" (temp), ++ [ptr]"+Q" (*ptr) ++ : [old_value]"r" (old_value), ++ [new_value]"r" (new_value) ++ : "memory", "cc" ++ ); // NOLINT ++ ++ return prev; ++} ++ ++inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, ++ Atomic64 old_value, ++ Atomic64 new_value) { ++ Atomic64 prev; ++ int32_t temp; ++ ++ MemoryBarrier(); ++ ++ __asm__ __volatile__ ( // NOLINT ++ "0: \n\t" ++ "ldxr %[prev], %[ptr] \n\t" ++ "cmp %[prev], %[old_value] \n\t" ++ "bne 1f \n\t" ++ "stxr %w[temp], %[new_value], %[ptr] \n\t" ++ "cbnz %w[temp], 0b \n\t" ++ "1: \n\t" ++ "clrex \n\t" ++ : [prev]"=&r" (prev), ++ [temp]"=&r" (temp), ++ [ptr]"+Q" (*ptr) ++ : [old_value]"r" (old_value), ++ [new_value]"r" (new_value) ++ : "memory", "cc" ++ ); // NOLINT ++ ++ return prev; ++} ++ ++inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) { ++ *ptr = value; ++} ++ ++inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) { ++ *ptr = value; ++ MemoryBarrier(); ++} ++ ++inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) { ++ MemoryBarrier(); ++ *ptr = value; ++} ++ ++inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) { ++ return *ptr; ++} ++ ++inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) { ++ Atomic64 value = *ptr; ++ MemoryBarrier(); ++ return value; ++} ++ ++inline Atomic64 Release_Load(volatile const Atomic64* ptr) { ++ MemoryBarrier(); ++ return *ptr; ++} ++ ++} // namespace base::subtle ++} // namespace base ++ ++#endif // BASE_ATOMICOPS_INTERNALS_ARM64_GCC_H_ diff --git a/www-client/firefox/files/arm64-3-set-WEBRTC_DETECT_ARM_NEON-when-optional.patch b/www-client/firefox/files/arm64-3-set-WEBRTC_DETECT_ARM_NEON-when-optional.patch new file mode 100644 index 0000000..21c3bf6 --- /dev/null +++ b/www-client/firefox/files/arm64-3-set-WEBRTC_DETECT_ARM_NEON-when-optional.patch @@ -0,0 +1,22 @@ +From: Mike Hommey +Date: Wed, 2 Mar 2016 10:01:15 +0900 +Subject: Bug 1252699 - Set WEBRTC_DETECT_ARM_NEON when optional neon is + requested. r=jesup + +--- + media/webrtc/trunk/webrtc/build/common.gypi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/media/webrtc/trunk/webrtc/build/common.gypi b/media/webrtc/trunk/webrtc/build/common.gypi +index 4e46b60..02aae44 100644 +--- a/media/webrtc/trunk/webrtc/build/common.gypi ++++ b/media/webrtc/trunk/webrtc/build/common.gypi +@@ -320,7 +320,7 @@ + ['arm_neon==1', { + 'defines': ['WEBRTC_ARCH_ARM_NEON',], + }], +- ['arm_neon==0 and (OS=="android" or moz_widget_toolkit_gonk==1)', { ++ ['arm_neon==0 and arm_neon_optional==1', { + 'defines': ['WEBRTC_DETECT_ARM_NEON',], + }], + ], diff --git a/www-client/firefox/files/arm64-4-link-chromium-mutex-based-atomics.patch b/www-client/firefox/files/arm64-4-link-chromium-mutex-based-atomics.patch new file mode 100644 index 0000000..53bbdc1 --- /dev/null +++ b/www-client/firefox/files/arm64-4-link-chromium-mutex-based-atomics.patch @@ -0,0 +1,59 @@ +From: Mike Hommey +Date: Sat, 19 Mar 2016 01:24:21 +0900 +Subject: Bug 1257888 - Link chromium mutex-based atomics implementation to + webrtc signaling tests + +--- + ipc/chromium/atomics/moz.build | 17 +++++++++++++++++ + ipc/chromium/moz.build | 4 ++++ + media/webrtc/signaling/test/common.build | 1 + + 3 files changed, 22 insertions(+) + create mode 100644 ipc/chromium/atomics/moz.build + +diff --git a/ipc/chromium/atomics/moz.build b/ipc/chromium/atomics/moz.build +new file mode 100644 +index 0000000..6e0a9e4 +--- /dev/null ++++ b/ipc/chromium/atomics/moz.build +@@ -0,0 +1,17 @@ ++# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- ++# vim: set filetype=python: ++# This Source Code Form is subject to the terms of the Mozilla Public ++# License, v. 2.0. If a copy of the MPL was not distributed with this ++# file, You can obtain one at http://mozilla.org/MPL/2.0/. ++ ++include('/ipc/chromium/chromium-config.mozbuild') ++ ++Library('chromium_atomics') ++ ++# This test is copied from ../moz.build for atomicops_internals_mutex.cc ++ost = CONFIG['OS_TEST'] ++if '86' not in ost and 'arm' not in ost and 'aarch64' != ost and 'mips' not in ost: ++ SOURCES += [ ++ '../src/base/atomicops_internals_mutex.cc', ++ '../src/base/lock_impl_posix.cc', ++ ] +diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build +index 88aaafe..52b6282 100644 +--- a/ipc/chromium/moz.build ++++ b/ipc/chromium/moz.build +@@ -172,3 +172,7 @@ CXXFLAGS += CONFIG['TK_CFLAGS'] + include('/ipc/chromium/chromium-config.mozbuild') + + FINAL_LIBRARY = 'xul' ++ ++DIRS += [ ++ 'atomics', ++] +diff --git a/media/webrtc/signaling/test/common.build b/media/webrtc/signaling/test/common.build +index c0a624f..21adad5 100644 +--- a/media/webrtc/signaling/test/common.build ++++ b/media/webrtc/signaling/test/common.build +@@ -79,6 +79,7 @@ if CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD'): + + USE_LIBS += [ + '/media/webrtc/trunk/testing/gtest_gtest/gtest', ++ 'chromium_atomics', + 'gkmedias', + 'nksrtp_s', + 'nss', diff --git a/www-client/firefox/files/arm64-5-mozjemalloc-no-static-page-sizes.patch b/www-client/firefox/files/arm64-5-mozjemalloc-no-static-page-sizes.patch new file mode 100644 index 0000000..1c8cd9a --- /dev/null +++ b/www-client/firefox/files/arm64-5-mozjemalloc-no-static-page-sizes.patch @@ -0,0 +1,22 @@ +From: Mike Hommey +Date: Wed, 25 Feb 2015 10:41:37 +0900 +Subject: Make powerpc not use static page sizes in mozjemalloc + +Closes: #763900 +--- + memory/mozjemalloc/jemalloc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c +index ee9e288..2e27e69 100644 +--- a/memory/mozjemalloc/jemalloc.c ++++ b/memory/mozjemalloc/jemalloc.c +@@ -1089,7 +1089,7 @@ static const bool config_recycle = false; + * controlling the malloc behavior are defined as compile-time constants + * for best performance and cannot be altered at runtime. + */ +-#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) ++#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !defined(__powerpc__) + #define MALLOC_STATIC_SIZES 1 + #endif + diff --git a/www-client/firefox/firefox-45.0.1.ebuild b/www-client/firefox/firefox-45.0.1-r1.ebuild similarity index 97% rename from www-client/firefox/firefox-45.0.1.ebuild rename to www-client/firefox/firefox-45.0.1-r1.ebuild index b7f1bfb..e71ab99 100644 --- a/www-client/firefox/firefox-45.0.1.ebuild +++ b/www-client/firefox/firefox-45.0.1-r1.ebuild @@ -132,6 +132,11 @@ src_unpack() { src_prepare() { # Apply our patches eapply "${WORKDIR}/firefox" \ + "${FILESDIR}"/arm64-1-define-ARCH_CPU_ARM64.patch \ + "${FILESDIR}"/arm64-2-import-crbug-for-aarch64.patch \ + "${FILESDIR}"/arm64-3-set-WEBRTC_DETECT_ARM_NEON-when-optional.patch \ + "${FILESDIR}"/arm64-4-link-chromium-mutex-based-atomics.patch \ + "${FILESDIR}"/arm64-5-mozjemalloc-no-static-page-sizes.patch \ "${FILESDIR}"/${PN}-45-qt-widget-fix.patch # Allow user to apply any additional patches without modifing ebuild