--- a/js/src/nanojit/Assembler.h
+++ b/js/src/nanojit/Assembler.h
@@ -309,17 +309,17 @@ namespace nanojit
 			void		asm_fop(LInsp ins);
 			void		asm_i2f(LInsp ins);
 			void		asm_u2f(LInsp ins);
 			Register	asm_prep_fcall(Reservation *rR, LInsp ins);
 			void		asm_nongp_copy(Register r, Register s);
 			void		asm_call(LInsp);
             void        asm_arg(ArgSize, LInsp, Register);
 			Register	asm_binop_rhs_reg(LInsp ins);
-			NIns*		asm_branch(bool branchOnFalse, LInsp cond, NIns* targ, bool far);
+			NIns*		asm_branch(bool branchOnFalse, LInsp cond, NIns* targ, bool isfar);
             void        assignSavedRegs();
             void        reserveSavedRegs();
             void        assignParamRegs();
             void        handleLoopCarriedExprs();
 			
 			// flag values for nMarkExecute
 			enum 
 			{

--- a/js/src/nanojit/NativeARM.cpp
+++ b/js/src/nanojit/NativeARM.cpp
@@ -1103,21 +1103,21 @@ Assembler::asm_fcmp(LInsp ins)
 Register
 Assembler::asm_prep_fcall(Reservation*, LInsp)
 {
     // We have nothing to do here; we do it all in asm_call.
     return UnknownReg;
 }
 
 NIns*
-Assembler::asm_branch(bool branchOnFalse, LInsp cond, NIns* targ, bool far)
+Assembler::asm_branch(bool branchOnFalse, LInsp cond, NIns* targ, bool isfar)
 {
-    // ignore far -- we figure this out on our own.
+    // ignore isfar -- we figure this out on our own.
     // XXX noone actually uses the far param in nj anyway... (always false)
-    (void)far;
+    (void)isfar;
 
     NIns* at = 0;
     LOpcode condop = cond->opcode();
     NanoAssert(cond->isCond());
 
     if (condop >= LIR_feq && condop <= LIR_fge)
     {
         if (branchOnFalse)

--- a/js/src/nanojit/NativeThumb.cpp
+++ b/js/src/nanojit/NativeThumb.cpp
@@ -371,17 +371,17 @@ namespace nanojit
 		if (d)
 		{
 			const int32_t* p = (const int32_t*) (ins-2);
 			STi(FP,d+4,p[1]);
 			STi(FP,d,p[0]);
 		}
 	}
 
-	NIns* Assembler::asm_branch(bool branchOnFalse, LInsp cond, NIns* targ)
+	NIns* Assembler::asm_branch(bool branchOnFalse, LInsp cond, NIns* targ, bool isfar)
 	{
 		NIns* at = 0;
 		LOpcode condop = cond->opcode();
 		NanoAssert(cond->isCond());
 #ifndef NJ_SOFTFLOAT
 		if (condop >= LIR_feq && condop <= LIR_fge)
 		{
 			return asm_jmpcc(branchOnFalse, cond, targ);