diff options
Diffstat (limited to 'xpcom/reflect/xptcall/md/unix/moz.build')
-rw-r--r-- | xpcom/reflect/xptcall/md/unix/moz.build | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/xpcom/reflect/xptcall/md/unix/moz.build b/xpcom/reflect/xptcall/md/unix/moz.build index 776ff13e4f..afab3acd2b 100644 --- a/xpcom/reflect/xptcall/md/unix/moz.build +++ b/xpcom/reflect/xptcall/md/unix/moz.build @@ -13,6 +13,10 @@ if CONFIG['OS_ARCH'] == 'Darwin': '!xptcstubs_asm_ppc_darwin.s', 'xptcinvoke_asm_ppc_rhapsody.s', ] + if CONFIG['OS_TEST'] == 'x86_64': + SOURCES += [ + 'xptcinvoke_asm_x86_64_unix.S', + ] if '86' in CONFIG['OS_TEST'] and CONFIG['OS_TEST'] != 'x86_64': DEFINES['MOZ_NEED_LEADING_UNDERSCORE'] = True @@ -23,10 +27,11 @@ if CONFIG['OS_ARCH'] == 'GNU': 'xptcstubs_gcc_x86_unix.cpp' ] -if CONFIG['OS_ARCH'] in ('Linux', 'Bitrig', 'DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD') or \ +if CONFIG['OS_ARCH'] in ('Linux', 'Bitrig', 'DragonFly', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS') or \ CONFIG['OS_ARCH'].startswith('GNU_'): if CONFIG['OS_TEST'] == 'x86_64': SOURCES += [ + 'xptcinvoke_asm_x86_64_unix.S', 'xptcinvoke_x86_64_unix.cpp', 'xptcstubs_x86_64_linux.cpp', ] @@ -45,22 +50,6 @@ if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD'): 'xptcstubs_ipf64.cpp' ] -# Without the need to accomodate the Sun compiler, Solaris/GCC support is pretty -# standard, actually. Not all that different from Linux. - -if CONFIG['OS_ARCH'] == 'SunOS': - if CONFIG['OS_TEST'] == 'x86_64': - SOURCES += [ - 'xptcinvoke_asm_x86_64_unix.S', - 'xptcinvoke_x86_64_solaris.cpp', - 'xptcstubs_x86_64_linux.cpp' - ] - elif '86' in CONFIG['OS_TEST']: - SOURCES += [ - 'xptcinvoke_gcc_x86_unix.cpp', - 'xptcstubs_gcc_x86_unix.cpp' - ] - if CONFIG['OS_TEST'] == 'alpha': if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD'): SOURCES += [ |