diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea4308a..57c25be 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
           make -C gas CFLAGS="${{ matrix.TARGET.CFLAGS }}"
           make -C binutils CFLAGS="${{ matrix.TARGET.CFLAGS }}"
           make -C ld CFLAGS="${{ matrix.TARGET.CFLAGS }}"
-          make -C sim CFLAGS="${{ matrix.TARGET.CFLAGS }}"
+          make -C sim FLAGS_TO_PASS=libsim.a CFLAGS="${{ matrix.TARGET.CFLAGS }}"
           make -C readline CFLAGS="${{ matrix.TARGET.CFLAGS }}"
           make -C gdb CFLAGS="${{ matrix.TARGET.CFLAGS }}"
       - name: Test for file
diff --git a/gdb/config/mips/mipslinuxgnu.mt b/gdb/config/mips/mipslinuxgnu.mt
index caba1db..2c766b0 100644
--- a/gdb/config/mips/mipslinuxgnu.mt
+++ b/gdb/config/mips/mipslinuxgnu.mt
@@ -1,5 +1,6 @@
 # Based on vr4300.mt
-TDEPFILES= mips-tdep.o remote-mips.o
+# TDEPFILES= mips-tdep.o remote-mips.o
+TDEPFILES= mips-tdep.o
 TM_FILE= tm-vr4300.h
-SIM_OBS = remote-sim.o
-SIM = ../sim/mips/libsim.a
+# SIM_OBS = remote-sim.o
+# SIM = ../sim/mips/libsim.a
diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index 6b6a6f9..af0173d 100644
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -439,7 +439,7 @@ enum float_operation
 #define NR_COP0_GPR	32
   unsigned_word cop0_gpr[NR_COP0_GPR];
 #define COP0_GPR	((CPU)->cop0_gpr)
-#define COP0_BADVADDR ((unsigned32)(COP0_GPR[8]))
+#define COP0_BADVADDR (COP0_GPR[8])
 
   /* Keep the current format state for each register: */
   FP_formats fpr_state[32];