Bug 1657135 - compile the correct files for xptcall on arm64 macOS r=glandium,xpcom-reviewers,nika

These files will all compile, but things will break at runtime because the
convention for stack arguments is slightly different on Darwin.  We'll fix
that in the next patch or two.

Depends on D87004

Differential Revision: https://phabricator.services.mozilla.com/D87005
This commit is contained in:
Nathan Froyd 2020-08-18 07:25:16 +00:00
Родитель 68e1fa98db
Коммит 83607c3e88
5 изменённых файлов: 11 добавлений и 2 удалений

Просмотреть файл

@ -18,6 +18,11 @@ if CONFIG['OS_ARCH'] == 'Darwin':
SOURCES += [
'xptcinvoke_asm_x86_64_unix.S',
]
if CONFIG['CPU_ARCH'] == 'aarch64':
SOURCES += [
'xptcinvoke_asm_aarch64.S',
'xptcstubs_asm_aarch64.S',
]
if CONFIG['OS_ARCH'] == 'GNU':
if CONFIG['CPU_ARCH'] == 'x86':
@ -113,9 +118,9 @@ if CONFIG['OS_ARCH'] in ('Linux', 'FreeBSD', 'NetBSD', 'OpenBSD'):
if CONFIG['CPU_ARCH'] == 'aarch64':
SOURCES += [
'xptcinvoke_aarch64.cpp',
'xptcinvoke_asm_aarch64.s',
'xptcinvoke_asm_aarch64.S',
'xptcstubs_aarch64.cpp',
'xptcstubs_asm_aarch64.s',
'xptcstubs_asm_aarch64.S',
]
if CONFIG['CPU_ARCH'] == 'mips64':
SOURCES += [

Просмотреть файл

@ -11,6 +11,8 @@
#include "xptcinvoke_ppc_rhapsody.cpp"
#elif defined(__arm__)
#include "xptcinvoke_arm.cpp"
#elif defined(__aarch64__)
#include "xptcinvoke_aarch64.cpp"
#else
#error unknown cpu architecture
#endif

Просмотреть файл

@ -11,6 +11,8 @@
#include "xptcstubs_ppc_rhapsody.cpp"
#elif defined(__arm__)
#include "xptcstubs_arm.cpp"
#elif defined(__aarch64__)
#include "xptcstubs_aarch64.cpp"
#else
#error unknown cpu architecture
#endif