Module: wine Branch: master Commit: c90ab917d15ee30570c2a690451aa06360cf85f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c90ab917d15ee30570c2a6904...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Feb 4 15:14:24 2021 +0100
libwine: Don't define obsolete functions on non-x86 platforms.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
include/wine/asm.h | 2 +- libs/wine/port.c | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/include/wine/asm.h b/include/wine/asm.h index b9dae95dc6d..51f04548731 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -175,7 +175,7 @@
#endif /* __i386__ */
-#if defined(__GNUC__) && !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) #define __ASM_OBSOLETE(func) __asm__( ".symver " #func "_obsolete," #func "@WINE_1.0" ) #else #undef __ASM_OBSOLETE diff --git a/libs/wine/port.c b/libs/wine/port.c index 8e56ada52aa..ee804f414a0 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -104,29 +104,6 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") -#elif defined(__arm__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, - "push {r4,LR}\n\t" /* save return address on stack */ - "mov r4, sp\n\t" /* store old sp in local var */ - "mov sp, r2\n\t" /* stack */ - "mov r2, r0\n\t" /* func -> scratch register */ - "mov r0, r1\n\t" /* arg */ - "blx r2\n\t" /* call func */ - "mov sp, r4\n\t" /* restore old sp from local var */ - "pop {r4,PC}") /* fetch return address into pc */ -#elif defined(__aarch64__) && defined(__GNUC__) -__ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, - "stp x29, x30, [sp,#-32]!\n\t" /* save return address on stack */ - "str x19, [sp,#16]\n\t" /* save register on stack */ - "mov x19, sp\n\t" /* store old sp in local var */ - "mov sp, x2\n\t" /* stack */ - "mov x2, x0\n\t" /* func -> scratch register */ - "mov x0, x1\n\t" /* arg */ - "blr x2\n\t" /* call func */ - "mov sp, x19\n\t" /* restore old sp from local var */ - "ldr x19, [sp,#16]\n\t" /* restore register from stack */ - "ldp x29, x30, [sp],#32\n\t" /* restore return address */ - "ret") /* return */ #endif
/***********************************************************************