--- assembler/jit/ExecutableAllocator.h.orig	2013-10-29 20:40:26 UTC

+++ assembler/jit/ExecutableAllocator.h

@@ -477,6 +477,11 @@ public:

     {

         sync_instruction_memory((caddr_t)code, size);

     }

+#elif CPU(ARM_TRADITIONAL) && OS(FREEBSD) && COMPILER(CLANG)

+    static void cacheFlush(void* code, size_t size)

+    {

+	__clear_cache(code, reinterpret_cast<char*>(code) + size);

+    }

 #endif

 private:

--- jit/AsmJSSignalHandlers.cpp.orig	2013-10-29 20:40:19 UTC

+++ jit/AsmJSSignalHandlers.cpp

@@ -109,6 +109,7 @@ using namespace mozilla;

 # endif

 # define EIP_sig(p) ((p)->uc_mcontext.mc_eip)

 # define RIP_sig(p) ((p)->uc_mcontext.mc_rip)

+# define PC_sig(p) ((p)->uc_mcontext.arm_pc)

 # define RAX_sig(p) ((p)->uc_mcontext.mc_rax)

 # define RCX_sig(p) ((p)->uc_mcontext.mc_rcx)

 # define RDX_sig(p) ((p)->uc_mcontext.mc_rdx)

@@ -124,7 +125,11 @@ using namespace mozilla;

 # define R12_sig(p) ((p)->uc_mcontext.mc_r12)

 # define R13_sig(p) ((p)->uc_mcontext.mc_r13)

 # define R14_sig(p) ((p)->uc_mcontext.mc_r14)

+#if defined(__FreeBSD__) && defined(__arm__)

+# define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15])

+#else

 # define R15_sig(p) ((p)->uc_mcontext.mc_r15)

+#endif

 #elif defined(XP_MACOSX)

 // Mach requires special treatment.

 #else

@@ -336,8 +341,8 @@ ContextToPC(CONTEXT *context)

     JS_STATIC_ASSERT(sizeof(EIP_sig(context)) == sizeof(void*));

     return reinterpret_cast<uint8_t**>(&EIP_sig(context));

 #  elif defined(JS_CPU_ARM)

-    JS_STATIC_ASSERT(sizeof(PC_sig(context)) == sizeof(void*));

-    return reinterpret_cast<uint8_t**>(&PC_sig(context));

+    JS_STATIC_ASSERT(sizeof(R15_sig(context)) == sizeof(void*));

+    return reinterpret_cast<uint8_t**>(&R15_sig(context));

 #  endif

 }

--- jit/arm/Architecture-arm.cpp.orig	2013-10-29 20:40:20 UTC

+++ jit/arm/Architecture-arm.cpp

@@ -15,7 +15,7 @@

 // lame check for kernel version

 // see bug 586550

-#if !(defined(ANDROID) || defined(MOZ_B2G))

+#if !(defined(ANDROID) || defined(MOZ_B2G) || defined(__FreeBSD__))

 #include <asm/hwcap.h>

 #else

 #define HWCAP_VFP      (1<<0)