diff options
Diffstat (limited to 'xpcom/reflect/xptcall/md/unix')
| -rw-r--r-- | xpcom/reflect/xptcall/md/unix/moz.build | 4 | ||||
| -rw-r--r-- | xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp | 2 | ||||
| -rw-r--r-- | xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S | 6 | ||||
| -rw-r--r-- | xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp | 2 | ||||
| -rw-r--r-- | xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S | 6 |
5 files changed, 4 insertions, 16 deletions
diff --git a/xpcom/reflect/xptcall/md/unix/moz.build b/xpcom/reflect/xptcall/md/unix/moz.build index 8ee7b3181..c5d968608 100644 --- a/xpcom/reflect/xptcall/md/unix/moz.build +++ b/xpcom/reflect/xptcall/md/unix/moz.build @@ -177,7 +177,7 @@ if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'powerpc': 'xptcstubs_ppc_openbsd.cpp', ] -if CONFIG['OS_ARCH'] == 'Linux' and 'sparc' in CONFIG['OS_TEST']: +if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TEST'] == 'sparc': SOURCES += [ 'xptcinvoke_asm_sparc_linux_GCC3.s', 'xptcinvoke_sparc_solaris.cpp', @@ -205,7 +205,7 @@ if CONFIG['OS_ARCH'] == 'OpenBSD' and CONFIG['OS_TEST'] == 'sparc': # files for 64-bit SPARC with no ill effects, so basically the entire mess that # was there before is no longer needed. -if CONFIG['OS_ARCH'] in ('OpenBSD', 'FreeBSD', 'SunOS') and CONFIG['OS_TEST'] == 'sparc64': +if CONFIG['OS_ARCH'] in ('OpenBSD', 'FreeBSD', 'SunOS', 'Linux') and CONFIG['OS_TEST'] == 'sparc64': SOURCES += [ 'xptcinvoke_asm_sparc64_openbsd.s', 'xptcinvoke_sparc64_openbsd.cpp', 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 |