[PATCH] msvcrt: Fix vtable alignment on macOS and certain non-x86 architectures.
Ken Thomases
ken at codeweavers.com
Mon Mar 18 14:21:55 CDT 2019
On some platforms and architectures, the .align <n> directive aligns to 2^n
bytes, not n bytes. The .balign <n> directive always aligns to n bytes.
Signed-off-by: Ken Thomases <ken at codeweavers.com>
---
This may break building for Solaris. We'll find out if anybody cares.
dlls/msvcrt/cxx.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h
index 027026efbb3..3765dc81d33 100644
--- a/dlls/msvcrt/cxx.h
+++ b/dlls/msvcrt/cxx.h
@@ -44,7 +44,7 @@
#define __ASM_VTABLE(name,funcs) \
__asm__(".data\n" \
- "\t.align 8\n" \
+ "\t.balign 8\n" \
"\t.quad " __ASM_NAME(#name "_rtti") "\n" \
"\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \
__ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \
@@ -56,7 +56,7 @@
#define __ASM_VTABLE(name,funcs) \
__asm__(".data\n" \
- "\t.align 4\n" \
+ "\t.balign 4\n" \
"\t.long " __ASM_NAME(#name "_rtti") "\n" \
"\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \
__ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \
--
2.21.0
More information about the wine-devel
mailing list