Bug 756745 - Use the "right" headers for mips xptc assembly on android. r=bsmedberg
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 24 May 2012 10:57:39 +0200
changeset 98881 e74adb8922758215d8f2f27ce8de547d5e6df20e
parent 98880 e31b42950e88f912f11527fe18c9aa5d16b1fb8e
child 98882 ca00c85ee997ed57666638d25aea2f9cd9ad33fe
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs756745
milestone15.0a1
Bug 756745 - Use the "right" headers for mips xptc assembly on android. r=bsmedberg
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.s
@@ -2,18 +2,24 @@
  * Version: MPL 1.1
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* This code is for MIPS using the O32 ABI. */
 
+#ifdef ANDROID
+#include <asm/regdef.h>
+#include <asm/asm.h>
+#include <machine/asm.h>
+#else
 #include <sys/regdef.h>
 #include <sys/asm.h>
+#endif
 
 # NARGSAVE is the argument space in the callers frame, including extra
 # 'shadowed' space for the argument registers. The minimum of 4
 # argument slots is sometimes predefined in the header files.
 #ifndef NARGSAVE
 #define NARGSAVE 4
 #endif
 
--- a/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s
@@ -5,18 +5,24 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * This Source Code Form is "Incompatible With Secondary Licenses", as
  * defined by the Mozilla Public License, v. 2.0. */
 
 /* This code is for MIPS using the O32 ABI. */
 
+#ifdef ANDROID
+#include <asm/regdef.h>
+#include <asm/asm.h>
+#include <machine/asm.h>
+#else
 #include <sys/regdef.h>
 #include <sys/asm.h>
+#endif
 
 # NARGSAVE is the argument space in the callers frame, including extra
 # 'shadowed' space for the argument registers. The minimum of 4
 # argument slots is sometimes predefined in the header files.
 #ifndef NARGSAVE
 #define NARGSAVE 4
 #endif