diff --git a/js/src/nanojit/avmplus.cpp b/js/src/nanojit/avmplus.cpp
index e46b5d202921..7be521a0a77a 100644
--- a/js/src/nanojit/avmplus.cpp
+++ b/js/src/nanojit/avmplus.cpp
@@ -60,9 +60,10 @@ avmplus::AvmLog(char const *msg, ...) {
 }
 
 #ifdef _DEBUG
-void NanoAssertFail()
-{
-    abort();
+namespace avmplus {
+    void AvmAssertFail(const char* /* msg */) {
+        abort();
+    }
 }
 #endif
 
diff --git a/js/src/nanojit/avmplus.h b/js/src/nanojit/avmplus.h
index dd3c1a6d2024..d07e6f30b4ac 100644
--- a/js/src/nanojit/avmplus.h
+++ b/js/src/nanojit/avmplus.h
@@ -87,7 +87,9 @@
 #endif
 
 #ifdef _DEBUG
-void NanoAssertFail();
+namespace avmplus {
+    void AvmAssertFail(const char* msg);
+}
 #endif
 
 #if defined(AVMPLUS_IA32)
diff --git a/js/src/nanojit/nanojit.h b/js/src/nanojit/nanojit.h
index d9dcdc54236e..5cfa38580f15 100644
--- a/js/src/nanojit/nanojit.h
+++ b/js/src/nanojit/nanojit.h
@@ -112,7 +112,7 @@ namespace nanojit
         #define __NanoAssertMsgf(a, file_, line_, f, ...)  \
             if (!(a)) { \
                 avmplus::AvmLog("Assertion failed: " f "%s (%s:%d)\n", __VA_ARGS__, #a, file_, line_); \
-                NanoAssertFail(); \
+                avmplus::AvmAssertFail(""); \
             }
 
         #define _NanoAssertMsgf(a, file_, line_, f, ...)   __NanoAssertMsgf(a, file_, line_, f, __VA_ARGS__)