From d7d4fde17e2ec64026b5d0291f1a4cf334179a2a Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 28 May 2017 21:48:23 +0200 Subject: [PATCH] winebuild-Fake_Dlls: Do not use get_alignment for .balign instructions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Spotted by Michael Müller. --- ...03-winebuild-Generate-syscall-thunks-for-ntdll-exports.patch | 2 +- ...8-winebuild-Try-to-make-sure-RVA-matches-between-fake-.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/winebuild-Fake_Dlls/0003-winebuild-Generate-syscall-thunks-for-ntdll-exports.patch b/patches/winebuild-Fake_Dlls/0003-winebuild-Generate-syscall-thunks-for-ntdll-exports.patch index 8a7a19a6..14744a80 100644 --- a/patches/winebuild-Fake_Dlls/0003-winebuild-Generate-syscall-thunks-for-ntdll-exports.patch +++ b/patches/winebuild-Fake_Dlls/0003-winebuild-Generate-syscall-thunks-for-ntdll-exports.patch @@ -291,7 +291,7 @@ index f3feb0f3300..dde1bd0704d 100644 + ORDDEF *odp = spec->syscalls[i]; + const char *name = odp->link_name; + -+ output( "\t.balign %d, 0\n", get_alignment(16) ); ++ output( "\t.balign 16, 0\n" ); + output( "\t%s\n", func_declaration(name) ); + output( "%s\n", asm_globl(name) ); + output_cfi( ".cfi_startproc" ); diff --git a/patches/winebuild-Fake_Dlls/0008-winebuild-Try-to-make-sure-RVA-matches-between-fake-.patch b/patches/winebuild-Fake_Dlls/0008-winebuild-Try-to-make-sure-RVA-matches-between-fake-.patch index baa03bce..1e9532c2 100644 --- a/patches/winebuild-Fake_Dlls/0008-winebuild-Try-to-make-sure-RVA-matches-between-fake-.patch +++ b/patches/winebuild-Fake_Dlls/0008-winebuild-Try-to-make-sure-RVA-matches-between-fake-.patch @@ -78,7 +78,7 @@ index 4dda31c349b..6a8a5d07ebd 100644 + output( "\t.align %d\n", get_alignment(65536) ); + output( "__wine_spec_pe_header_syscalls:\n" ); + output( "\t.byte 0\n" ); -+ output( "\t.balign %d, 0\n", get_alignment(page_size) ); ++ output( "\t.balign %d, 0\n", page_size ); + output( "\n/* syscall thunks */\n\n" ); for (i = 0; i < spec->nb_syscalls; i++)