Bug 521340 - TM merge: more build infrastructure (tracemonkey side), r=nnethercote.

js/src/lirasm/lirasm.cpp

@@ -113,9 +113,9 @@ nanojit::LirNameMap::formatGuard(LIns *i, char *out)
 }
 #endif
 
-typedef FASTCALL int32_t (*RetInt)();
-typedef FASTCALL double (*RetFloat)();
-typedef FASTCALL GuardRecord* (*RetGuard)();
+typedef int32_t (FASTCALL *RetInt)();
+typedef double (FASTCALL *RetFloat)();
+typedef GuardRecord* (FASTCALL *RetGuard)();
 
 struct Function {
     const char *name;
@@ -325,6 +325,14 @@ private:
     void endFragment();
 };
 
+// 'sin' is overloaded on some platforms, so taking its address
+// doesn't quite work. Provide a do-nothing function here
+// that's not overloaded.
+double sinFn(double d) {
+    return sin(d);
+}
+#define sin sinFn
+
 Function functions[] = {
     FN(puts, I32 | (PTRARG<<2)),
     FN(sin, F64 | (F64<<2)),

js/src/nanojit/VMPI.h

@@ -46,6 +46,10 @@
 #ifndef __VMPI_h__
 #define __VMPI_h__
 
+#if defined(HAVE_CONFIG_H) && defined(NANOJIT_CENTRAL)
+#include "config.h"
+#endif
+
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>

js/src/nanojit/avmplus.h

@@ -36,10 +36,6 @@
 #ifndef avm_h___
 #define avm_h___
 
-#if defined(HAVE_CONFIG_H) && defined(NANOJIT_CENTRAL)
-#include "config.h"
-#endif
-
 #include "VMPI.h"
 
 #if !defined(AVMPLUS_LITTLE_ENDIAN) && !defined(AVMPLUS_BIG_ENDIAN)