Fix build with -fno-common (default in gcc10)

diff --git a/Makefile.libretro b/Makefile.libretro
index e674063..3efe8f9 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -186,7 +186,7 @@ else ifeq ($(platform), vita)
        CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
        CFLAGS += -fsingle-precision-constant -mword-relocations -fno-unwind-tables
        CFLAGS += -fno-asynchronous-unwind-tables -ftree-vectorize -funroll-loops
-       CFLAGS += -fno-optimize-sibling-calls -fcommon
+       CFLAGS += -fno-optimize-sibling-calls
        CFLAGS += -I$(VITASDK)/include -Ifrontend/vita
        CFLAGS += -DNO_SOCKET -DNO_OS -DNO_DYLIB
        ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
@@ -209,7 +209,7 @@ else ifeq ($(platform), ctr)
        AR = $(DEVKITARM)/bin/arm-none-eabi-ar$(EXE_EXT)
        CFLAGS += -DARM11 -D_3DS -DNO_OS -DNO_DYLIB -DNO_SOCKET -DTHREAD_ENABLED -DGPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV
        CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
-       CFLAGS += -Wall -mword-relocations -fcommon
+       CFLAGS += -Wall -mword-relocations
        CFLAGS += -fomit-frame-pointer -ffast-math -funroll-loops
        CFLAGS += -Ifrontend/3ds -I$(CTRULIB)/include
        CFLAGS += -Werror=implicit-function-declaration

diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index bebec87..db0b1ec 100644 (file)
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -70,7 +70,9 @@ static const s32 VerboseLevel     = VERBOSE_LEVEL;
 
 /******************************************************************************/
 
+#ifndef NEW_DYNAREC
 Rcnt rcnts[ CounterQuantity ];
+#endif
 
 u32 hSyncCount = 0;
 u32 frame_counter = 0;
@@ -496,7 +498,7 @@ s32 psxRcntFreeze( void *f, s32 Mode )
     u32 count;
     s32 i;
 
-    gzfreeze( &rcnts, sizeof(rcnts) );
+    gzfreeze( &rcnts, sizeof(Rcnt) * CounterQuantity );
     gzfreeze( &hSyncCount, sizeof(hSyncCount) );
     gzfreeze( &spuSyncCount, sizeof(spuSyncCount) );
     gzfreeze( &psxNextCounter, sizeof(psxNextCounter) );

diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 1118107..0a3e00b 100644 (file)
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -27,7 +27,9 @@
 #include "gte.h"
 
 R3000Acpu *psxCpu = NULL;
+#ifndef NEW_DYNAREC
 psxRegisters psxRegs;
+#endif
 
 int psxInit() {
        SysPrintf(_("Running PCSX Version %s (%s).\n"), PCSX_VERSION, __DATE__);