From 6ce0909c3a0ec75ac2e5e88621b826e23c4d92f5 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Thu, 18 Dec 2008 12:56:22 +0000 Subject: [PATCH] Fix the Linux 32 debug & devbuild versions as well. git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@451 a6443dda-0b58-4228-96e9-037be469359c --- pcsx2/x86/iVUzerorec.cpp | 7 ++++++- pcsx2/x86/ix86/ix86.c | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pcsx2/x86/iVUzerorec.cpp b/pcsx2/x86/iVUzerorec.cpp index e92fb95bed..8d4f7d369a 100644 --- a/pcsx2/x86/iVUzerorec.cpp +++ b/pcsx2/x86/iVUzerorec.cpp @@ -2611,8 +2611,13 @@ __declspec(naked) static void svudispfn() mov s_saveebp, ebp } #else - +#ifdef __LINUX__ +extern "C" { +#endif void svudispfn(); +#ifdef __LINUX__ +} +#endif void svudispfntemp() { diff --git a/pcsx2/x86/ix86/ix86.c b/pcsx2/x86/ix86/ix86.c index ccf58ba7e7..30ab02e615 100644 --- a/pcsx2/x86/ix86/ix86.c +++ b/pcsx2/x86/ix86/ix86.c @@ -3395,7 +3395,8 @@ __forceinline void LEA16RStoR(x86IntRegType to, x86IntRegType from, u32 scale) LEA32RStoR(to, from, scale); } -__forceinline void LEA32RStoR(x86IntRegType to, x86IntRegType from, u32 scale) +// Don't inline recursive functions +void LEA32RStoR(x86IntRegType to, x86IntRegType from, u32 scale) { if( to == from ) { SHL32ItoR(to, scale);