From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 26 20:33:11 2015 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A31CF9C for ; Mon, 26 Jan 2015 20:33:11 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D9CCB9EE for ; Mon, 26 Jan 2015 20:33:10 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id t0QKX1rK070184 for ; Mon, 26 Jan 2015 20:33:01 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id t0QKWumK067586 for freebsd-gecko@freebsd.org; Mon, 26 Jan 2015 20:32:56 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 26 Jan 2015 20:32:56 GMT Message-Id: <201501262032.t0QKWumK067586@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1810 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jan 2015 20:33:11 -0000 Author: jbeich Date: Mon Jan 26 20:32:55 2015 New Revision: 1810 Log: add ARM build fixes for JavaScript engine PR: 197058 Submitted by: sbruno (earlier version) Obtained from: ports@r377953 Added: trunk/mail/thunderbird/files/patch-bug1125579 trunk/mail/thunderbird/files/patch-bug1125580 trunk/www/firefox-esr/files/patch-bug1125579 trunk/www/firefox-esr/files/patch-bug1125580 trunk/www/firefox-nightly/files/patch-bug1125579 trunk/www/firefox-nightly/files/patch-bug1125580 trunk/www/firefox/files/patch-bug1125579 trunk/www/firefox/files/patch-bug1125580 trunk/www/libxul/files/patch-bug1125579 trunk/www/libxul/files/patch-bug1125580 trunk/www/seamonkey/files/patch-bug1125579 trunk/www/seamonkey/files/patch-bug1125580 Added: trunk/mail/thunderbird/files/patch-bug1125579 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug1125579 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,14 @@ +--- mozilla/js/src/assembler/jit/ExecutableAllocator.h~ ++++ mozilla/js/src/assembler/jit/ExecutableAllocator.h +@@ -454,6 +454,11 @@ public: + { + User::IMB_Range(code, static_cast(code) + size); + } ++#elif WTF_CPU_ARM_TRADITIONAL && (WTF_OS_FREEBSD || WTF_OS_NETBSD) ++ static void cacheFlush(void* code, size_t size) ++ { ++ __clear_cache(code, reinterpret_cast(code) + size); ++ } + #elif WTF_CPU_ARM_TRADITIONAL && WTF_OS_LINUX && WTF_COMPILER_RVCT + static __asm void cacheFlush(void* code, size_t size); + #elif WTF_CPU_ARM_TRADITIONAL && (WTF_OS_LINUX || WTF_OS_ANDROID) && WTF_COMPILER_GCC Added: trunk/mail/thunderbird/files/patch-bug1125580 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug1125580 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,11 @@ +--- mozilla/js/src/jit/arm/Architecture-arm.cpp~ ++++ mozilla/js/src/jit/arm/Architecture-arm.cpp +@@ -17,7 +17,7 @@ + + #define HWCAP_USE_HARDFP_ABI (1 << 28) + +-#if !(defined(ANDROID) || defined(MOZ_B2G)) && !defined(JS_ARM_SIMULATOR) ++#if defined(__linux__) && !defined(ANDROID) && !defined(MOZ_B2G) && !defined(JS_ARM_SIMULATOR) + #define HWCAP_ARMv7 (1 << 29) + #include + #else Added: trunk/www/firefox-esr/files/patch-bug1125579 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug1125579 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,14 @@ +--- js/src/assembler/jit/ExecutableAllocator.h~ ++++ js/src/assembler/jit/ExecutableAllocator.h +@@ -454,6 +454,11 @@ public: + { + User::IMB_Range(code, static_cast(code) + size); + } ++#elif WTF_CPU_ARM_TRADITIONAL && (WTF_OS_FREEBSD || WTF_OS_NETBSD) ++ static void cacheFlush(void* code, size_t size) ++ { ++ __clear_cache(code, reinterpret_cast(code) + size); ++ } + #elif WTF_CPU_ARM_TRADITIONAL && WTF_OS_LINUX && WTF_COMPILER_RVCT + static __asm void cacheFlush(void* code, size_t size); + #elif WTF_CPU_ARM_TRADITIONAL && (WTF_OS_LINUX || WTF_OS_ANDROID) && WTF_COMPILER_GCC Added: trunk/www/firefox-esr/files/patch-bug1125580 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug1125580 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,11 @@ +--- js/src/jit/arm/Architecture-arm.cpp~ ++++ js/src/jit/arm/Architecture-arm.cpp +@@ -17,7 +17,7 @@ + + #define HWCAP_USE_HARDFP_ABI (1 << 28) + +-#if !(defined(ANDROID) || defined(MOZ_B2G)) && !defined(JS_ARM_SIMULATOR) ++#if defined(__linux__) && !defined(ANDROID) && !defined(MOZ_B2G) && !defined(JS_ARM_SIMULATOR) + #define HWCAP_ARMv7 (1 << 29) + #include + #else Added: trunk/www/firefox-nightly/files/patch-bug1125579 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug1125579 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,16 @@ +diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h +index d55c8ed..ab6188f 100644 +--- js/src/jit/ExecutableAllocator.h ++++ js/src/jit/ExecutableAllocator.h +@@ -405,6 +405,11 @@ public: + _flush_cache(reinterpret_cast(code), size, BCACHE); + #endif + } ++#elif defined(JS_CODEGEN_ARM) && (defined(__FreeBSD__) || defined(__NetBSD__)) ++ static void cacheFlush(void* code, size_t size) ++ { ++ __clear_cache(code, reinterpret_cast(code) + size); ++ } + #elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__) + static void cacheFlush(void* code, size_t size) + { Added: trunk/www/firefox-nightly/files/patch-bug1125580 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug1125580 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,13 @@ +diff --git js/src/jit/arm/Architecture-arm.cpp js/src/jit/arm/Architecture-arm.cpp +index fe1373b..76641aa 100644 +--- js/src/jit/arm/Architecture-arm.cpp ++++ js/src/jit/arm/Architecture-arm.cpp +@@ -16,7 +16,7 @@ + #include "jit/arm/Assembler-arm.h" + #include "jit/RegisterSets.h" + +-#if defined(ANDROID) || defined(JS_ARM_SIMULATOR) ++#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR) + // The Android NDK and B2G do not include the hwcap.h kernel header, and it is not + // defined when building the simulator, so inline the header defines we need. + # define HWCAP_VFP (1 << 6) Added: trunk/www/firefox/files/patch-bug1125579 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug1125579 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,16 @@ +diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h +index d55c8ed..ab6188f 100644 +--- js/src/jit/ExecutableAllocator.h ++++ js/src/jit/ExecutableAllocator.h +@@ -405,6 +405,11 @@ public: + _flush_cache(reinterpret_cast(code), size, BCACHE); + #endif + } ++#elif defined(JS_CODEGEN_ARM) && (defined(__FreeBSD__) || defined(__NetBSD__)) ++ static void cacheFlush(void* code, size_t size) ++ { ++ __clear_cache(code, reinterpret_cast(code) + size); ++ } + #elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__) + static void cacheFlush(void* code, size_t size) + { Added: trunk/www/firefox/files/patch-bug1125580 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug1125580 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,13 @@ +diff --git js/src/jit/arm/Architecture-arm.cpp js/src/jit/arm/Architecture-arm.cpp +index fe1373b..76641aa 100644 +--- js/src/jit/arm/Architecture-arm.cpp ++++ js/src/jit/arm/Architecture-arm.cpp +@@ -16,7 +16,7 @@ + #include "jit/arm/Assembler-arm.h" + #include "jit/RegisterSets.h" + +-#if defined(ANDROID) || defined(JS_ARM_SIMULATOR) ++#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR) + // The Android NDK and B2G do not include the hwcap.h kernel header, and it is not + // defined when building the simulator, so inline the header defines we need. + # define HWCAP_VFP (1 << 6) Added: trunk/www/libxul/files/patch-bug1125579 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug1125579 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,14 @@ +--- js/src/assembler/jit/ExecutableAllocator.h~ ++++ js/src/assembler/jit/ExecutableAllocator.h +@@ -454,6 +454,11 @@ public: + { + User::IMB_Range(code, static_cast(code) + size); + } ++#elif WTF_CPU_ARM_TRADITIONAL && (WTF_OS_FREEBSD || WTF_OS_NETBSD) ++ static void cacheFlush(void* code, size_t size) ++ { ++ __clear_cache(code, reinterpret_cast(code) + size); ++ } + #elif WTF_CPU_ARM_TRADITIONAL && WTF_OS_LINUX && WTF_COMPILER_RVCT + static __asm void cacheFlush(void* code, size_t size); + #elif WTF_CPU_ARM_TRADITIONAL && (WTF_OS_LINUX || WTF_OS_ANDROID) && WTF_COMPILER_GCC Added: trunk/www/libxul/files/patch-bug1125580 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug1125580 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,11 @@ +--- js/src/jit/arm/Architecture-arm.cpp~ ++++ js/src/jit/arm/Architecture-arm.cpp +@@ -17,7 +17,7 @@ + + #define HWCAP_USE_HARDFP_ABI (1 << 28) + +-#if !(defined(ANDROID) || defined(MOZ_B2G)) && !defined(JS_ARM_SIMULATOR) ++#if defined(__linux__) && !defined(ANDROID) && !defined(MOZ_B2G) && !defined(JS_ARM_SIMULATOR) + #define HWCAP_ARMv7 (1 << 29) + #include + #else Added: trunk/www/seamonkey/files/patch-bug1125579 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug1125579 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,16 @@ +diff --git js/src/jit/ExecutableAllocator.h js/src/jit/ExecutableAllocator.h +index d55c8ed..ab6188f 100644 +--- mozilla/js/src/jit/ExecutableAllocator.h ++++ mozilla/js/src/jit/ExecutableAllocator.h +@@ -405,6 +405,11 @@ public: + _flush_cache(reinterpret_cast(code), size, BCACHE); + #endif + } ++#elif defined(JS_CODEGEN_ARM) && (defined(__FreeBSD__) || defined(__NetBSD__)) ++ static void cacheFlush(void* code, size_t size) ++ { ++ __clear_cache(code, reinterpret_cast(code) + size); ++ } + #elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__) + static void cacheFlush(void* code, size_t size) + { Added: trunk/www/seamonkey/files/patch-bug1125580 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug1125580 Mon Jan 26 20:32:55 2015 (r1810) @@ -0,0 +1,13 @@ +diff --git js/src/jit/arm/Architecture-arm.cpp js/src/jit/arm/Architecture-arm.cpp +index fe1373b..76641aa 100644 +--- mozilla/js/src/jit/arm/Architecture-arm.cpp ++++ mozilla/js/src/jit/arm/Architecture-arm.cpp +@@ -16,7 +16,7 @@ + #include "jit/arm/Assembler-arm.h" + #include "jit/RegisterSets.h" + +-#if defined(ANDROID) || defined(JS_ARM_SIMULATOR) ++#if !defined(__linux__) || defined(ANDROID) || defined(JS_ARM_SIMULATOR) + // The Android NDK and B2G do not include the hwcap.h kernel header, and it is not + // defined when building the simulator, so inline the header defines we need. + # define HWCAP_VFP (1 << 6)