Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F152995951
D1683.id3449.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
7 KB
Referenced Files
None
Subscribers
None
D1683.id3449.diff
View Options
Index: mail/thunderbird/files/patch-bug1125579
===================================================================
--- /dev/null
+++ mail/thunderbird/files/patch-bug1125579
@@ -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<char*>(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<char*>(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
Index: mail/thunderbird/files/patch-bug1125580
===================================================================
--- /dev/null
+++ mail/thunderbird/files/patch-bug1125580
@@ -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 <asm/hwcap.h>
+ #else
Index: www/firefox-esr/files/patch-bug1125579
===================================================================
--- /dev/null
+++ www/firefox-esr/files/patch-bug1125579
@@ -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<char*>(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<char*>(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
Index: www/firefox-esr/files/patch-bug1125580
===================================================================
--- /dev/null
+++ www/firefox-esr/files/patch-bug1125580
@@ -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 <asm/hwcap.h>
+ #else
Index: www/firefox/files/patch-bug1125579
===================================================================
--- /dev/null
+++ www/firefox/files/patch-bug1125579
@@ -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<char*>(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<char*>(code) + size);
++ }
+ #elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__)
+ static void cacheFlush(void* code, size_t size)
+ {
Index: www/firefox/files/patch-bug1125580
===================================================================
--- /dev/null
+++ www/firefox/files/patch-bug1125580
@@ -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)
Index: www/libxul/files/patch-bug1125579
===================================================================
--- /dev/null
+++ www/libxul/files/patch-bug1125579
@@ -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<char*>(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<char*>(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
Index: www/libxul/files/patch-bug1125580
===================================================================
--- /dev/null
+++ www/libxul/files/patch-bug1125580
@@ -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 <asm/hwcap.h>
+ #else
Index: www/seamonkey/files/patch-bug1125579
===================================================================
--- /dev/null
+++ www/seamonkey/files/patch-bug1125579
@@ -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<char*>(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<char*>(code) + size);
++ }
+ #elif defined(JS_CODEGEN_ARM) && (defined(__linux__) || defined(ANDROID)) && defined(__GNUC__)
+ static void cacheFlush(void* code, size_t size)
+ {
Index: www/seamonkey/files/patch-bug1125580
===================================================================
--- /dev/null
+++ www/seamonkey/files/patch-bug1125580
@@ -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)
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Apr 19, 1:09 PM (1 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31772097
Default Alt Text
D1683.id3449.diff (7 KB)
Attached To
Mode
D1683: www/firefox et al.: add ARM build fixes
Attached
Detach File
Event Timeline
Log In to Comment