April 2024 - Wine-Commits - list.winehq.org

Alexandre Julliard : sti: Use fully interpreted IDL stubs.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: 94be5173be69a57431808b8e092560a9b8abbfa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/94be5173be69a57431808b8e092560… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:59:01 2024 +0200 sti: Use fully interpreted IDL stubs. --- dlls/sti/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index cbdc42ea2d0..ed695590a37 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = sti IMPORTS = uuid ole32 oleaut32 rpcrt4 advapi32 EXTRADLLFLAGS = -Wb,--prefer-native +EXTRAIDLFLAGS = -Oicf SOURCES = \ sti.c \

1 0

Alexandre Julliard : oleacc: Use fully interpreted IDL stubs.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: ecea5c848e53e0650d971ec529ee70ba5ecdf536 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecea5c848e53e0650d971ec529ee70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:58:38 2024 +0200 oleacc: Use fully interpreted IDL stubs. --- dlls/oleacc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index 4bd7438aec5..4f511ebabcb 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -2,6 +2,8 @@ MODULE = oleacc.dll IMPORTLIB = oleacc IMPORTS = uuid oleaut32 ole32 user32 rpcrt4 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ client.c \ main.c \

1 0

Alexandre Julliard : netapi32: Use fully interpreted IDL stubs.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: 51804c5b2ebf05f5193c03b5afe8499f8f1323be URL: https://gitlab.winehq.org/wine/wine/-/commit/51804c5b2ebf05f5193c03b5afe849… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:58:21 2024 +0200 netapi32: Use fully interpreted IDL stubs. --- dlls/netapi32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 055e8dd04d4..0729c34eb0a 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -3,6 +3,8 @@ UNIXLIB = netapi32.so IMPORTLIB = netapi32 IMPORTS = rpcrt4 iphlpapi ws2_32 advapi32 dnsapi +EXTRAIDLFLAGS = -Oicf + SOURCES = \ atsvc.idl \ nbcmdqueue.c \

1 0

Alexandre Julliard : mstask: Use fully interpreted IDL stubs.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: 207832f79a8dca120643007ce13c0b4735b4cd2b URL: https://gitlab.winehq.org/wine/wine/-/commit/207832f79a8dca120643007ce13c0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:58:10 2024 +0200 mstask: Use fully interpreted IDL stubs. --- dlls/mstask/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index bb6ed7638dc..0581beaffda 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -1,6 +1,8 @@ MODULE = mstask.dll IMPORTS = rpcrt4 ole32 oleaut32 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ atsvc.idl \ factory.c \

1 0

Alexandre Julliard : msi: Use fully interpreted IDL stubs.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: f22fac6b3e019f900071c6fb6d9ef6a3b81d7548 URL: https://gitlab.winehq.org/wine/wine/-/commit/f22fac6b3e019f900071c6fb6d9ef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:57:58 2024 +0200 msi: Use fully interpreted IDL stubs. --- dlls/msi/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 21420909a92..f58b8793790 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -2,7 +2,7 @@ MODULE = msi.dll IMPORTLIB = msi IMPORTS = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 sxs imagehlp mspatcha odbccp32 wintrust crypt32 -EXTRAIDLFLAGS = --prefix-server=s_ +EXTRAIDLFLAGS = -Oicf --prefix-server=s_ SOURCES = \ action.c \

1 0

Alexandre Julliard : msdaps: Use fully interpreted IDL stubs.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: 2ff3f2b17ba45ca7eff4f9f41a32bd7e65930432 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ff3f2b17ba45ca7eff4f9f41a32bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:57:49 2024 +0200 msdaps: Use fully interpreted IDL stubs. --- dlls/msdaps/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index bf1e5c8b3b4..e2070f7aa98 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -9,5 +9,6 @@ SOURCES = \ usrmarshal.c dlldata_EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_ +EXTRAIDLFLAGS = -Oicf i386_EXTRAIDLFLAGS = --packing=2 arm_EXTRAIDLFLAGS = --packing=2

1 0

Alexandre Julliard : rpcrt4: Move call_server_func() to a separate file.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: 6647987edc71209731399a1025a576cc80188169 URL: https://gitlab.winehq.org/wine/wine/-/commit/6647987edc71209731399a1025a576… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:57:12 2024 +0200 rpcrt4: Move call_server_func() to a separate file. And build it as x86-64 code on ARM64EC. --- dlls/rpcrt4/ndr_stubless.c | 233 +-------------------------------------------- dlls/rpcrt4/thunks.c | 195 +++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+), 231 deletions(-)

1 0

Alexandre Julliard : rpcrt4: Move the stubless delegating thunks to a separate file.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: fb8ae8ca35b5ce77cdbce5c60b900fafddcc35cb URL: https://gitlab.winehq.org/wine/wine/-/commit/fb8ae8ca35b5ce77cdbce5c60b900f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:54:37 2024 +0200 rpcrt4: Move the stubless delegating thunks to a separate file. And build them as x86-64 code on ARM64EC. --- dlls/rpcrt4/cpsf.h | 105 ++++----------------------------------------------- dlls/rpcrt4/cstub.c | 88 ------------------------------------------ dlls/rpcrt4/thunks.c | 88 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 186 deletions(-) diff --git a/dlls/rpcrt4/cpsf.h b/dlls/rpcrt4/cpsf.h index 4f3a930a5a5..caa4d30298b 100644 --- a/dlls/rpcrt4/cpsf.h +++ b/dlls/rpcrt4/cpsf.h @@ -71,105 +71,14 @@ HRESULT create_stub(REFIID iid, IUnknown *pUnk, IRpcStubBuffer **ppstub); BOOL fill_stubless_table(IUnknownVtbl *vtbl, DWORD num); const IUnknownVtbl *get_delegating_vtbl(DWORD num_methods); -#define THUNK_ENTRY_FIRST_BLOCK() \ - THUNK_ENTRY(3) \ - THUNK_ENTRY(4) \ - THUNK_ENTRY(5) \ - THUNK_ENTRY(6) \ - THUNK_ENTRY(7) \ - THUNK_ENTRY(8) \ - THUNK_ENTRY(9) \ - THUNK_ENTRY(10) \ - THUNK_ENTRY(11) \ - THUNK_ENTRY(12) \ - THUNK_ENTRY(13) \ - THUNK_ENTRY(14) \ - THUNK_ENTRY(15) \ - THUNK_ENTRY(16) \ - THUNK_ENTRY(17) \ - THUNK_ENTRY(18) \ - THUNK_ENTRY(19) \ - THUNK_ENTRY(20) \ - THUNK_ENTRY(21) \ - THUNK_ENTRY(22) \ - THUNK_ENTRY(23) \ - THUNK_ENTRY(24) \ - THUNK_ENTRY(25) \ - THUNK_ENTRY(26) \ - THUNK_ENTRY(27) \ - THUNK_ENTRY(28) \ - THUNK_ENTRY(29) \ - THUNK_ENTRY(30) \ - THUNK_ENTRY(31) +#define NB_THUNK_ENTRIES 1024 -#define THUNK_ENTRY_BLOCK(block) \ - THUNK_ENTRY(32 * (block) + 0) \ - THUNK_ENTRY(32 * (block) + 1) \ - THUNK_ENTRY(32 * (block) + 2) \ - THUNK_ENTRY(32 * (block) + 3) \ - THUNK_ENTRY(32 * (block) + 4) \ - THUNK_ENTRY(32 * (block) + 5) \ - THUNK_ENTRY(32 * (block) + 6) \ - THUNK_ENTRY(32 * (block) + 7) \ - THUNK_ENTRY(32 * (block) + 8) \ - THUNK_ENTRY(32 * (block) + 9) \ - THUNK_ENTRY(32 * (block) + 10) \ - THUNK_ENTRY(32 * (block) + 11) \ - THUNK_ENTRY(32 * (block) + 12) \ - THUNK_ENTRY(32 * (block) + 13) \ - THUNK_ENTRY(32 * (block) + 14) \ - THUNK_ENTRY(32 * (block) + 15) \ - THUNK_ENTRY(32 * (block) + 16) \ - THUNK_ENTRY(32 * (block) + 17) \ - THUNK_ENTRY(32 * (block) + 18) \ - THUNK_ENTRY(32 * (block) + 19) \ - THUNK_ENTRY(32 * (block) + 20) \ - THUNK_ENTRY(32 * (block) + 21) \ - THUNK_ENTRY(32 * (block) + 22) \ - THUNK_ENTRY(32 * (block) + 23) \ - THUNK_ENTRY(32 * (block) + 24) \ - THUNK_ENTRY(32 * (block) + 25) \ - THUNK_ENTRY(32 * (block) + 26) \ - THUNK_ENTRY(32 * (block) + 27) \ - THUNK_ENTRY(32 * (block) + 28) \ - THUNK_ENTRY(32 * (block) + 29) \ - THUNK_ENTRY(32 * (block) + 30) \ - THUNK_ENTRY(32 * (block) + 31) - -#define ALL_THUNK_ENTRIES \ - THUNK_ENTRY_FIRST_BLOCK() \ - THUNK_ENTRY_BLOCK(1) \ - THUNK_ENTRY_BLOCK(2) \ - THUNK_ENTRY_BLOCK(3) \ - THUNK_ENTRY_BLOCK(4) \ - THUNK_ENTRY_BLOCK(5) \ - THUNK_ENTRY_BLOCK(6) \ - THUNK_ENTRY_BLOCK(7) \ - THUNK_ENTRY_BLOCK(8) \ - THUNK_ENTRY_BLOCK(9) \ - THUNK_ENTRY_BLOCK(10) \ - THUNK_ENTRY_BLOCK(11) \ - THUNK_ENTRY_BLOCK(12) \ - THUNK_ENTRY_BLOCK(13) \ - THUNK_ENTRY_BLOCK(14) \ - THUNK_ENTRY_BLOCK(15) \ - THUNK_ENTRY_BLOCK(16) \ - THUNK_ENTRY_BLOCK(17) \ - THUNK_ENTRY_BLOCK(18) \ - THUNK_ENTRY_BLOCK(19) \ - THUNK_ENTRY_BLOCK(20) \ - THUNK_ENTRY_BLOCK(21) \ - THUNK_ENTRY_BLOCK(22) \ - THUNK_ENTRY_BLOCK(23) \ - THUNK_ENTRY_BLOCK(24) \ - THUNK_ENTRY_BLOCK(25) \ - THUNK_ENTRY_BLOCK(26) \ - THUNK_ENTRY_BLOCK(27) \ - THUNK_ENTRY_BLOCK(28) \ - THUNK_ENTRY_BLOCK(29) \ - THUNK_ENTRY_BLOCK(30) \ - THUNK_ENTRY_BLOCK(31) +struct delegating_vtbl +{ + IUnknownVtbl vtbl; + const void *methods[NB_THUNK_ENTRIES - 3]; +}; -#define NB_THUNK_ENTRIES (32 * 32) +extern const struct delegating_vtbl delegating_vtbl; #endif /* __WINE_CPSF_H */ diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 896ae89655b..719ee859163 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -102,94 +102,6 @@ HRESULT CStdStubBuffer_Construct(REFIID riid, return S_OK; } -static HRESULT WINAPI delegating_QueryInterface(IUnknown *pUnk, REFIID iid, void **ppv) -{ - *ppv = pUnk; - return S_OK; -} - -static ULONG WINAPI delegating_AddRef(IUnknown *pUnk) -{ - return 1; -} - -static ULONG WINAPI delegating_Release(IUnknown *pUnk) -{ - return 1; -} - -/* The idea here is to replace the first param on the stack - ie. This (which will point to cstdstubbuffer_delegating_t) - with This->stub_buffer.pvServerObject and then jump to the - relevant offset in This->stub_buffer.pvServerObject's vtbl. -*/ -#ifdef __i386__ - -#define THUNK_ENTRY_SIZE 20 -#define THUNK_ENTRY(num) \ - ".balign 4\n\t" \ - "mov 4(%esp),%eax\n\t" \ - "mov 0x10(%eax),%eax\n\t" \ - "mov %eax,4(%esp)\n\t" \ - "mov (%eax),%eax\n\t" \ - ".byte 0xff,0xa0\n\t" /* jmp *offset(%eax) */ \ - ".long 4*("#num")\n\t" - -#elif defined(__x86_64__) - -#define THUNK_ENTRY_SIZE 16 -#define THUNK_ENTRY(num) \ - ".balign 4\n\t" \ - "movq 0x20(%rcx),%rcx\n\t" \ - "movq (%rcx),%rax\n\t" \ - ".byte 0xff,0xa0\n\t" /* jmp *offset(%rax) */ \ - ".long 8*("#num")\n\t" - -#elif defined(__arm__) - -#define THUNK_ENTRY_SIZE 12 -#define THUNK_ENTRY(num) \ - ".balign 4\n\t" \ - "ldr r0, [r0, #0x10]\n\t" \ - "ldr ip, [r0]\n\t" \ - "ldr pc, [ip, #(4*("#num"))]\n\t" - -#elif defined(__aarch64__) - -#define THUNK_ENTRY_SIZE 20 -#define THUNK_ENTRY(num) \ - "ldr x0, [x0, #0x20]\n\t" \ - "ldr x16, [x0]\n\t" \ - "mov x17, #("#num")\n\t" \ - "ldr x16, [x16, x17, lsl #3]\n\t" \ - "br x16\n\t" - -#else - -#warning You must implement delegated proxies/stubs for your CPU -#define THUNK_ENTRY_SIZE 0 -#define THUNK_ENTRY(num) "" - -#endif - -extern void vtbl_thunks(void); -__ASM_GLOBAL_FUNC( vtbl_thunks, ALL_THUNK_ENTRIES ) -#undef THUNK_ENTRY - -static const struct -{ - IUnknownVtbl vtbl; - const void *methods[NB_THUNK_ENTRIES - 3]; -} delegating_vtbl = -{ - { delegating_QueryInterface, delegating_AddRef, delegating_Release }, - { -#define THUNK_ENTRY(num) (char *)vtbl_thunks + ((num) - 3) * THUNK_ENTRY_SIZE, - ALL_THUNK_ENTRIES -#undef THUNK_ENTRY - } -}; - BOOL fill_delegated_proxy_table(IUnknownVtbl *vtbl, DWORD num) { diff --git a/dlls/rpcrt4/thunks.c b/dlls/rpcrt4/thunks.c index fd658329980..e017efd184d 100644 --- a/dlls/rpcrt4/thunks.c +++ b/dlls/rpcrt4/thunks.c @@ -30,6 +30,7 @@ #include "winbase.h" #include "objbase.h" #include "rpcproxy.h" +#include "cpsf.h" #include "wine/asm.h" #define ALL_THUNK_ENTRIES \ @@ -231,3 +232,90 @@ __ASM_GLOBAL_FUNC( call_stubless_func, __ASM_GLOBAL_FUNC( stubless_thunks, ALL_THUNK_ENTRIES ) #undef T + + +/* The idea here is to replace the first param on the stack + ie. This (which will point to cstdstubbuffer_delegating_t) + with This->stub_buffer.pvServerObject and then jump to the + relevant offset in This->stub_buffer.pvServerObject's vtbl. +*/ +#ifdef __i386__ + +#define T(num) \ + ".balign 4\n\t" \ + ".globl " __ASM_NAME("NdrProxyForwardingFunction" #num) "\n" \ + __ASM_NAME("NdrProxyForwardingFunction" #num) ":\n\t" \ + "mov 4(%esp),%eax\n\t" \ + "mov 0x10(%eax),%eax\n\t" \ + "mov %eax,4(%esp)\n\t" \ + "mov (%eax),%eax\n\t" \ + ".byte 0xff,0xa0\n\t" /* jmp *offset(%eax) */ \ + ".long 4*"#num"\n\t" + +#elif defined __x86_64__ + +#define T(num) \ + ".balign 4\n\t" \ + ".globl " __ASM_NAME("NdrProxyForwardingFunction" #num) "\n" \ + __ASM_NAME("NdrProxyForwardingFunction" #num) ":\n\t" \ + "movq 0x20(%rcx),%rcx\n\t" \ + "movq (%rcx),%rax\n\t" \ + ".byte 0xff,0xa0\n\t" /* jmp *offset(%rax) */ \ + ".long 8*"#num"\n\t" + +#elif defined __aarch64__ + +#define T(num) \ + ".globl NdrProxyForwardingFunction" #num "\n" \ + "NdrProxyForwardingFunction" #num ":\n\t" \ + "ldr x0, [x0, #0x20]\n\t" \ + "ldr x16, [x0]\n\t" \ + "mov x17, #"#num"\n\t" \ + "ldr x16, [x16, x17, lsl #3]\n\t" \ + "br x16\n\t" + +#elif defined __arm__ + +#define T(num) \ + ".balign 4\n\t" \ + ".globl NdrProxyForwardingFunction" #num "\n" \ + "NdrProxyForwardingFunction" #num ":\n\t" \ + "ldr r0, [r0, #0x10]\n\t" \ + "ldr ip, [r0]\n\t" \ + "ldr pc, [ip, #(4*"#num")]\n\t" + +#endif /* __i386__ */ + +__ASM_GLOBAL_FUNC( vtbl_thunks, ALL_THUNK_ENTRIES ) + +#undef T + +static HRESULT WINAPI delegating_QueryInterface(IUnknown *pUnk, REFIID iid, void **ppv) +{ + *ppv = pUnk; + return S_OK; +} + +static ULONG WINAPI delegating_AddRef(IUnknown *pUnk) +{ + return 1; +} + +static ULONG WINAPI delegating_Release(IUnknown *pUnk) +{ + return 1; +} + +#define T(num) extern void NdrProxyForwardingFunction##num(void); +ALL_THUNK_ENTRIES +#undef T + +const struct delegating_vtbl delegating_vtbl = +{ + { delegating_QueryInterface, delegating_AddRef, delegating_Release }, + { +#define T(num) (void *)NdrProxyForwardingFunction##num, + ALL_THUNK_ENTRIES +#undef T + } +};

1 0

Alexandre Julliard : rpcrt4: Move the stubless client thunks to a separate file.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: d28f4fd0ecf5818d542dcd6fe5ca7d3d65f1b8f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d28f4fd0ecf5818d542dcd6fe5ca7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:53:53 2024 +0200 rpcrt4: Move the stubless client thunks to a separate file. And build them as x86-64 code on ARM64EC. --- dlls/rpcrt4/Makefile.in | 1 + dlls/rpcrt4/cproxy.c | 145 +----------------------------- dlls/rpcrt4/thunks.c | 233 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 238 insertions(+), 141 deletions(-)

1 0

Alexandre Julliard : makefiles: Support building files for x86-64 architecture on ARM64EC.
by Alexandre Julliard April 30, 2024

April 30, 2024

Module: wine Branch: master Commit: 3e2a999013e71d5cb14cdd9662fd2444718cd70c URL: https://gitlab.winehq.org/wine/wine/-/commit/3e2a999013e71d5cb14cdd9662fd24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 14:52:35 2024 +0200 makefiles: Support building files for x86-64 architecture on ARM64EC. Based on a patch by Jacek Caban. --- configure | 19 +++++++++++++++++-- configure.ac | 14 ++++++++++++-- tools/makedep.c | 26 ++++++++++++++++++++++---- 3 files changed, 51 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 2b4597a72d9..e94c59ad767 100755 --- a/configure +++ b/configure @@ -10310,7 +10310,16 @@ saved_CC=$CC saved_CFLAGS=$CFLAGS saved_LDFLAGS=$LDFLAGS -for wine_arch in $cross_archs +{ extra_arch=; unset extra_arch;} +for arch in $cross_archs +do + case $arch in + arm64ec) test ${extra_arch+y} || extra_arch=x86_64 ;; + x86_64) extra_arch="" ;; + esac +done + +for wine_arch in $cross_archs $extra_arch do case "x$with_mingw" in xclang|x*/clang) eval "${wine_arch}_CC=\$with_mingw" ;; @@ -10840,7 +10849,13 @@ fi fi fi - as_fn_append PE_ARCHS " $wine_arch" + if test "x$wine_arch" = x$extra_arch +then : + +else $as_nop + as_fn_append PE_ARCHS " $wine_arch" +fi + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-fno-strict-aliasing" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-strict-aliasing" >&5 printf %s "checking whether $CC supports -fno-strict-aliasing... " >&6; } diff --git a/configure.ac b/configure.ac index b03bb12f303..834b1535b2d 100644 --- a/configure.ac +++ b/configure.ac @@ -793,7 +793,16 @@ saved_CC=$CC saved_CFLAGS=$CFLAGS saved_LDFLAGS=$LDFLAGS -for wine_arch in $cross_archs +AS_UNSET(extra_arch) +for arch in $cross_archs +do + case $arch in + arm64ec) test ${extra_arch+y} || extra_arch=x86_64 ;; + x86_64) extra_arch="" ;; + esac +done + +for wine_arch in $cross_archs $extra_arch do case "x$with_mingw" in xclang|x*/clang) AS_VAR_SET(${wine_arch}_CC,$with_mingw) ;; @@ -925,7 +934,8 @@ This is an error since --enable-archs=$wine_arch was requested.])]) This is an error since --enable-archs=$wine_arch was requested.])]) continue])]) - AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"]) + AS_VAR_IF([wine_arch],[$extra_arch],[],[AS_VAR_APPEND([PE_ARCHS],[" $wine_arch"])]) + WINE_TRY_PE_CFLAGS([-fno-strict-aliasing]) dnl clang needs to be told to fail on unknown options WINE_TRY_PE_CFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"]) diff --git a/tools/makedep.c b/tools/makedep.c index 77cf6e476bb..f22552f8400 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -101,6 +101,7 @@ struct incl_file #define FLAG_C_IMPLIB 0x040000 /* file is part of an import library */ #define FLAG_C_UNIX 0x080000 /* file is part of a Unix library */ #define FLAG_SFD_FONTS 0x100000 /* sfd file generated bitmap fonts */ +#define FLAG_ARM64EC_X64 0x200000 /* use x86_64 object on ARM64EC */ static const struct { @@ -984,6 +985,7 @@ static void parse_pragma_directive( struct file *source, char *str ) { if (!strcmp( flag, "implib" )) source->flags |= FLAG_C_IMPLIB; if (!strcmp( flag, "unix" )) source->flags |= FLAG_C_UNIX; + if (!strcmp( flag, "arm64ec_x64" )) source->flags |= FLAG_ARM64EC_X64; } } } @@ -3185,7 +3187,8 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou struct strarray defines, struct strarray *targets, unsigned int arch ) { - const char *obj_name; + const char *obj_name, *var_cc, *var_cflags; + struct strarray arch_cflags = empty_strarray; if (make->disabled[arch] && !(source->file->flags & FLAG_C_IMPLIB)) return; @@ -3216,11 +3219,26 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou else strarray_add( &make->clean_files, obj_name ); + if ((source->file->flags & FLAG_ARM64EC_X64) && !strcmp( archs.str[arch], "arm64ec" )) + { + var_cc = "$(x86_64_CC)"; + var_cflags = "$(x86_64_CFLAGS)"; + strarray_add( &arch_cflags, "-D__arm64ec_x64__" ); + strarray_addall( &arch_cflags, get_expanded_make_var_array( top_makefile, "x86_64_EXTRACFLAGS" )); + } + else + { + var_cc = arch_make_variable( "CC", arch ); + var_cflags = arch_make_variable( "CFLAGS", arch ); + strarray_addall( &arch_cflags, make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] ); + } + output( "%s: %s\n", obj_dir_path( make, obj_name ), source->filename ); - output( "\t%s%s -c -o $@ %s", cmd_prefix( "CC" ), arch_make_variable( "CC", arch ), source->filename ); + output( "\t%s%s -c -o $@ %s", cmd_prefix( "CC" ), var_cc, source->filename ); output_filenames( defines ); if (!source->use_msvcrt) output_filenames( make->unix_cflags ); - output_filenames( make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] ); + output_filenames( arch_cflags ); + if (!arch) { if (source->file->flags & FLAG_C_UNIX) @@ -3241,7 +3259,7 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou } output_filenames( cpp_flags ); - output_filename( arch_make_variable( "CFLAGS", arch )); + output_filename( var_cflags ); output( "\n" ); if (make->testdll && strendswith( source->name, ".c" ) &&

1 0