summaryrefslogtreecommitdiffstats
path: root/xpcom/reflect/xptcall
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-02-22 19:03:00 -0500
committerMatt A. Tobin <email@mattatobin.com>2020-02-22 19:03:00 -0500
commit69ed4e4b4ee94b69f55e2e0d405aff109e3d145c (patch)
tree47e775a19e4ac23d4e70970fc24dec619cbfd110 /xpcom/reflect/xptcall
parent7c8262e8c30018c1c522de5db1f22f815212a89f (diff)
downloadUXP-69ed4e4b4ee94b69f55e2e0d405aff109e3d145c.tar
UXP-69ed4e4b4ee94b69f55e2e0d405aff109e3d145c.tar.gz
UXP-69ed4e4b4ee94b69f55e2e0d405aff109e3d145c.tar.lz
UXP-69ed4e4b4ee94b69f55e2e0d405aff109e3d145c.tar.xz
UXP-69ed4e4b4ee94b69f55e2e0d405aff109e3d145c.zip
Issue #1053 - Remove android support from XPCOM
Diffstat (limited to 'xpcom/reflect/xptcall')
-rw-r--r--xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp2
-rw-r--r--xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S6
-rw-r--r--xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp2
-rw-r--r--xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S6
4 files changed, 2 insertions, 14 deletions
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp
index 4cd5eb47d..ef725e5e3 100644
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp
+++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp
@@ -9,7 +9,7 @@
#include "mozilla/Compiler.h"
-#if !defined(__arm__) && !(defined(LINUX) || defined(ANDROID) || defined(XP_IOS))
+#if !defined(__arm__) && !(defined(LINUX) || defined(XP_IOS))
#error "This code is for Linux/iOS ARM only. Check that it works on your system, too.\nBeware that this code is highly compiler dependent."
#endif
diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S
index 32ff3b356..9fd99faa6 100644
--- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S
+++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S
@@ -7,14 +7,8 @@
/* 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
diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp
index ef4f8514d..78664dfcf 100644
--- a/xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp
+++ b/xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp
@@ -8,7 +8,7 @@
#include "xptcprivate.h"
#include "xptiprivate.h"
-#if !defined(__arm__) && !(defined(LINUX) || defined(ANDROID) || defined(XP_DARWIN))
+#if !defined(__arm__) && !(defined(LINUX) || defined(XP_DARWIN))
#error "This code is for Linux/iOS ARM only. Please check if it works for you, too.\nDepends strongly on gcc behaviour."
#endif
diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S b/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S
index d17301634..ebfba775a 100644
--- a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S
+++ b/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S
@@ -5,14 +5,8 @@
/* 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