3 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index 7cd367b..e3446f2 100755
--- a/configure
+++ b/configure
@@ -3913,6 +3913,8 @@ fi
 
 CFLAGS="-Wall -Os -std=gnu99"
 
+LIBS="-lgcc"
+
 
 #-------------------------------------------------------------------------
 # MCPPBS subproject list
diff --git a/configure.ac b/configure.ac
index 45bbaae..bbd9b43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,6 +72,7 @@ AC_HEADER_STDC
 #-------------------------------------------------------------------------
 
 AC_SUBST([CFLAGS],  ["-Wall -Os -std=gnu99"])
+AC_SUBST([LIBS],  ["-lgcc"])
 
 #-------------------------------------------------------------------------
 # MCPPBS subproject list
diff --git a/pk/fp.c b/pk/fp.c
index 25b0393..5604bc8 100644
--- a/pk/fp.c
+++ b/pk/fp.c
@@ -57,8 +57,8 @@ int emulate_fp(trapframe_t* tf)
   uint32_t frs2s = get_fp_reg(RRS2, 0);
   uint32_t frs3s = get_fp_reg(RRS3, 0);
 
-  uint64_t effective_address_load = XRS1 + imm;
-  uint64_t effective_address_store = XRS1 + bimm;
+  long effective_address_load = XRS1 + imm;
+  long effective_address_store = XRS1 + bimm;
 
   softfloat_exceptionFlags = 0;
   softfloat_roundingMode = (RM & 4) ? (RM & 3) : ((fp_state.fsr >> 5) & 3);