Bug 575205 - JM: Make JaegerMonkey work on Solaris x86/x64 with Sun Studio 12. r=dvander.

js/src/jscntxt.cpp

@@ -166,7 +166,7 @@ StackSpace::finish()
 #elif defined(XP_OS2)
     DosFreeMem(base);
 #else
-    munmap(base, CAPACITY_BYTES);
+    munmap((caddr_t)base, CAPACITY_BYTES);
 #endif
 }
 

js/src/jsinterp.cpp

@@ -759,7 +759,7 @@ InternalGetOrSet(JSContext *cx, JSObject *obj, jsid id, const Value &fval,
 }
 
 bool
-Execute(JSContext *cx, JSObject *const chain, JSScript *script,
+Execute(JSContext *cx, JSObject *chain, JSScript *script,
         JSStackFrame *down, uintN flags, Value *result)
 {
     if (script->isEmpty()) {

js/src/jsprvtd.h

@@ -57,6 +57,8 @@
 #include "jspubtd.h"
 #include "jsutil.h"
 
+JS_BEGIN_EXTERN_C
+
 /*
  * Convenience constants.
  */
@@ -358,4 +360,6 @@ typedef JSBool
 extern JSBool js_CStringsAreUTF8;
 #endif
 
+JS_END_EXTERN_C
+
 #endif /* jsprvtd_h___ */

js/src/jstypes.h

@@ -325,6 +325,10 @@
 # ifdef __x86_64__
 #  define JS_64BIT
 # endif
+#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# ifdef __x86_64
+#  define JS_64BIT
+# endif
 #else
 # error "Implement me"
 #endif

js/src/jsval.h

@@ -61,6 +61,8 @@ JS_BEGIN_EXTERN_C
    * so we just don't try to align.
    */
 # define JSVAL_ALIGNMENT
+#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+# define JSVAL_ALIGNMENT
 #endif
 
 /*