[v23] Patch for configure.in, aclocal.m4, ios.m4, vm/NumericConversio…

…ns.h.
ricardoquesada · Aug 6, 2013 · efb51d7 · efb51d7
1 parent 40270c2
commit efb51d7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/js/src/aclocal.m4 b/js/src/aclocal.m4
@@ -25,6 +25,7 @@ builtin(include, build/autoconf/compiler-opts.m4)dnl
 builtin(include, build/autoconf/expandlibs.m4)dnl
 builtin(include, build/autoconf/arch.m4)dnl
 builtin(include, build/autoconf/android.m4)dnl
+builtin(include, build/autoconf/ios.m4)dnl
 builtin(include, build/autoconf/zlib.m4)dnl
 builtin(include, build/autoconf/linux.m4)dnl
 builtin(include, build/autoconf/python-virtualenv.m4)dnl

diff --git a/js/src/configure.in b/js/src/configure.in
@@ -162,6 +162,11 @@ MOZ_ARG_WITH_STRING(gonk-toolchain-prefix,
                           prefix to gonk toolchain commands],
     gonk_toolchain_prefix=$withval)
 
+MOZ_ARG_WITH_STRING(ios-target,
+[  --with-ios-target=SDK
+                     what target sdk to use, defaults to iPhoneSimulator],
+    ios_target=$withval)
+
 if test -n "$gonkdir" ; then
     kernel_name=`uname -s | tr "[[:upper:]]" "[[:lower:]]"`
 
@@ -213,6 +218,8 @@ if test -n "$gonkdir" ; then
     AC_DEFINE(ANDROID)
     AC_DEFINE(GONK)
     CROSS_COMPILE=1
+elif test -n "$ios_target" ; then
+    MOZ_IOS_SDK
 else
     MOZ_ANDROID_NDK
 fi

diff --git a/js/src/jspubtd.h b/js/src/jspubtd.h
@@ -44,6 +44,10 @@ struct Zone;
  * oblivious to the change. This feature can be explicitly disabled in debug
  * builds by defining JS_NO_JSVAL_JSID_STRUCT_TYPES.
  */
+
+// Needed for cocos2d-js
+#define JS_NO_JSVAL_JSID_STRUCT_TYPES 
+
 # if defined(DEBUG) && !defined(JS_NO_JSVAL_JSID_STRUCT_TYPES)
 #  define JS_USE_JSID_STRUCT_TYPES
 # endif

diff --git a/js/src/vm/NumericConversions.h b/js/src/vm/NumericConversions.h
@@ -155,7 +155,7 @@ ToIntWidth(double d)
 inline int32_t
 ToInt32(double d)
 {
-#if defined (__arm__) && defined (__GNUC__)
+#if defined (__arm__) && defined (__GNUC__) && !defined(__clang__)
     int32_t i;
     uint32_t    tmp0;
     uint32_t    tmp1;