From 32ff13c4d59cb437e722f81db0f8145472b692e4 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Wed, 24 Aug 2016 21:23:02 +0200 Subject: [PATCH] Backed out changeset f517b043170b (bug 1272498) --- xpcom/reflect/xptcall/md/unix/moz.build | 4 ---- xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_x86_64_unix.s | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/xpcom/reflect/xptcall/md/unix/moz.build b/xpcom/reflect/xptcall/md/unix/moz.build index 3c4934342587..23a0ab2a30dd 100644 --- a/xpcom/reflect/xptcall/md/unix/moz.build +++ b/xpcom/reflect/xptcall/md/unix/moz.build @@ -20,10 +20,6 @@ if CONFIG['OS_ARCH'] == 'Darwin': ] if '86' in CONFIG['OS_TEST'] and CONFIG['OS_TEST'] != 'x86_64': DEFINES['MOZ_NEED_LEADING_UNDERSCORE'] = True - if CONFIG['CLANG_CXX']: - ASFLAGS += [ - '-no-integrated-as', - ] if CONFIG['OS_ARCH'] == 'GNU': if CONFIG['CPU_ARCH'] == 'x86': diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_x86_64_unix.s b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_x86_64_unix.s index b2079b897655..5045b0e6cb3b 100644 --- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_x86_64_unix.s +++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_x86_64_unix.s @@ -30,7 +30,7 @@ NS_InvokeByIndex: lea eax, [edx * 8] sub rsp, rax -# If there is an odd number of args the stack can be misaligned so realign it. +# if there is an odd number of args the stack can be misaligned so realign it. and rsp, 0xffffffffffffff00 # pass the stack slot area to InvokeCopyToStack.