From: Daniel Morilha <dmorilha@gmail.com>
Date: Wed, 21 Oct 2020 06:32:24 +0000 (-0700)
Subject: fixes link time errors on the RPi platform (tested with 3 and 4)
X-Git-Tag: r24l~620^2
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6b38f881b9690c31915d019df329d02cda8344a;hp=19b9695a71f15ef0bf61c7c3cfd6c98ec5ccb028;p=pcsx_rearmed.git

fixes link time errors on the RPi platform (tested with 3 and 4)
---

diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index bebec876..2dd7d890 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -70,8 +70,6 @@ static const s32 VerboseLevel     = VERBOSE_LEVEL;
 
 /******************************************************************************/
 
-Rcnt rcnts[ CounterQuantity ];
-
 u32 hSyncCount = 0;
 u32 frame_counter = 0;
 static u32 hsync_steps = 0;
@@ -496,7 +494,7 @@ s32 psxRcntFreeze( void *f, s32 Mode )
     u32 count;
     s32 i;
 
-    gzfreeze( &rcnts, sizeof(rcnts) );
+    gzfreeze( &rcnts, sizeof(*rcnts) * CounterQuantity );
     gzfreeze( &hSyncCount, sizeof(hSyncCount) );
     gzfreeze( &spuSyncCount, sizeof(spuSyncCount) );
     gzfreeze( &psxNextCounter, sizeof(psxNextCounter) );
diff --git a/libpcsxcore/psxcounters.h b/libpcsxcore/psxcounters.h
index 4b7b6b41..d986435b 100644
--- a/libpcsxcore/psxcounters.h
+++ b/libpcsxcore/psxcounters.h
@@ -39,6 +39,7 @@ typedef struct Rcnt
     u32 rate, irq, counterState, irqState;
     u32 cycle, cycleStart;
 } Rcnt;
+
 extern Rcnt rcnts[];
 
 void psxRcntInit();
diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 11181070..a8d2745c 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -27,7 +27,6 @@
 #include "gte.h"
 
 R3000Acpu *psxCpu = NULL;
-psxRegisters psxRegs;
 
 int psxInit() {
 	SysPrintf(_("Running PCSX Version %s (%s).\n"), PCSX_VERSION, __DATE__);