diff --git a/sim/rtlsim/Makefile b/sim/rtlsim/Makefile
index c4d66a2d..61cf2408 100644
--- a/sim/rtlsim/Makefile
+++ b/sim/rtlsim/Makefile
@@ -81,7 +81,7 @@ $(PROJECT): $(SRCS)
 	
 static: $(SRCS)
 	verilator --build $(VL_FLAGS) $(SRCS) -CFLAGS '$(CXXFLAGS)' -LDFLAGS '$(LDFLAGS)'
-	$(AR) rcs lib$(PROJECT).a obj_dir/*.o
+	$(AR) rcs lib$(PROJECT).a obj_dir/*.o ../common/softfloat/build/Linux-x86_64-GCC/*.o
 
 clean-static:
 	rm -rf lib$(PROJECT).a obj_dir
diff --git a/sim/simX/Makefile b/sim/simX/Makefile
index 2dc4eaf7..59281fb5 100644
--- a/sim/simX/Makefile
+++ b/sim/simX/Makefile
@@ -37,7 +37,7 @@ obj_dir/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 static: $(OBJS)
-	$(AR) rcs lib$(PROJECT).a $(OBJS)
+	$(AR) rcs lib$(PROJECT).a $(OBJS) ../common/softfloat/build/Linux-x86_64-GCC/*.o
 
 .depend: $(SRCS)
 	$(CXX) $(CXXFLAGS) -MM $^ > .depend;
diff --git a/sim/vlsim/Makefile b/sim/vlsim/Makefile
index b58429fc..8c7a0e20 100644
--- a/sim/vlsim/Makefile
+++ b/sim/vlsim/Makefile
@@ -28,7 +28,6 @@ DBG_FLAGS += -DDBG_CACHE_REQ_INFO
 CONFIGS ?= -DNUM_CLUSTERS=1 -DNUM_CORES=1
 
 CXXFLAGS += $(CONFIGS)
-CXXFLAGS += -D
 
 SRCS = ../common/util.cpp ../common/mem.cpp ../common/rvfloats.cpp
 SRCS += $(DPI_DIR)/util_dpi.cpp $(DPI_DIR)/float_dpi.cpp
@@ -97,7 +96,7 @@ shared: $(SRCS) vortex_afu.h
 
 static: $(SRCS) vortex_afu.h
 	verilator --build $(VL_FLAGS) $(SRCS) -CFLAGS '$(CXXFLAGS)' -LDFLAGS '$(LDFLAGS)'
-	$(AR) rcs $(PROJECT).a obj_dir/*.o
+	$(AR) rcs $(PROJECT).a obj_dir/*.o ../common/softfloat/build/Linux-x86_64-GCC/*.o
 
 clean-static:
 	rm -rf $(PROJECT).a obj_dir vortex_afu.h
diff --git a/tests/opencl/Makefile b/tests/opencl/Makefile
index 803dbab4..f457b49f 100644
--- a/tests/opencl/Makefile
+++ b/tests/opencl/Makefile
@@ -6,7 +6,7 @@ all:
 	$(MAKE) -C nearn
 	$(MAKE) -C guassian
 	$(MAKE) -C oclprintf
-	#$(MAKE) -C psort
+	$(MAKE) -C psort
 	
 run-simx:
 	$(MAKE) -C vecadd run-simx 
@@ -16,7 +16,7 @@ run-simx:
 	$(MAKE) -C nearn run-simx
 	$(MAKE) -C guassian run-simx
 	$(MAKE) -C oclprintf run-simx
-    #$(MAKE) -C psort run-simx
+    $(MAKE) -C psort run-simx
 
 run-rtlsim:
 	$(MAKE) -C vecadd run-rtlsim 
@@ -26,7 +26,7 @@ run-rtlsim:
 	$(MAKE) -C nearn run-rtlsim
 	$(MAKE) -C guassian run-rtlsim
 	$(MAKE) -C oclprintf run-rtlsim
-    #$(MAKE) -C psort run-rtlsim
+    $(MAKE) -C psort run-rtlsim
 
 run-vlsim:
 	$(MAKE) -C vecadd run-vlsim 
@@ -36,7 +36,7 @@ run-vlsim:
 	$(MAKE) -C nearn run-vlsim
 	$(MAKE) -C guassian run-vlsim
 	$(MAKE) -C oclprintf run-vlsim
-    #$(MAKE) -C psort run-vlsim
+    $(MAKE) -C psort run-vlsim
 
 clean:
 	$(MAKE) -C vecadd clean