diff --git a/common/build/Utilities/Utilities.cbp b/common/build/Utilities/Utilities.cbp index 5bf89b7bbc..750ff13cc2 100644 --- a/common/build/Utilities/Utilities.cbp +++ b/common/build/Utilities/Utilities.cbp @@ -80,6 +80,7 @@ + @@ -99,6 +100,7 @@ + diff --git a/common/include/Pcsx2Defs.h b/common/include/Pcsx2Defs.h index b4da3fd487..5cd4e4686b 100644 --- a/common/include/Pcsx2Defs.h +++ b/common/include/Pcsx2Defs.h @@ -235,8 +235,8 @@ This theoretically unoptimizes. Not having much luck so far. # define PCSX2_ALIGNED_EXTERN(alig,x) extern x __attribute((aligned(alig))) # define PCSX2_ALIGNED16_EXTERN(x) extern x __attribute((aligned(16))) -# define __naked // GCC lacks the naked specifier -# define __assume(cond) // GCC has no equivalent for __assume +# define __naked // GCC lacks the naked specifier +# define __assume(cond) ((void)0) // GCC has no equivalent for __assume # define CALLBACK __attribute__((stdcall)) // Inlining note: GCC needs ((unused)) attributes defined on inlined functions to suppress diff --git a/common/include/Utilities/Assertions.h b/common/include/Utilities/Assertions.h index d094396512..6c6ec8f7db 100644 --- a/common/include/Utilities/Assertions.h +++ b/common/include/Utilities/Assertions.h @@ -68,7 +68,7 @@ #else // Release Builds just use __assume as an optimization, and return the conditional - // as a result (if . + // as a result (which is optimized to nil if unused). # define pxAssertMsg(cond, msg) (__assume(cond), likely(cond)) # define pxAssertDev(cond, msg) (__assume(cond), likely(cond)) @@ -77,8 +77,6 @@ #endif -__cold - #define pxAssert(cond) pxAssertMsg(cond, (wxChar*)NULL) extern void pxOnAssert( const wxChar* file, int line, const char* func, const wxChar* cond, const wxChar* msg); diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp index a597f061ed..7d828cec08 100644 --- a/pcsx2/Linux/pcsx2.cbp +++ b/pcsx2/Linux/pcsx2.cbp @@ -414,7 +414,9 @@ - + +