113 files changed, 129 insertions, 114 deletions

diff --git a/Makefile.in b/Makefile.in
index c4279a5..53dfb60 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,11 +82,14 @@ VPATH := $(addprefix $(src_dir)/, $(sprojs_enabled))
 #  - CPPFLAGS : flags for the preprocessor (eg. -I,-D)
 #  - CXXFLAGS : flags for C++ compiler (eg. -Wall,-g,-O3)
 
+CC            := @CC@
 CXX           := @CXX@
 CPPFLAGS      := @CPPFLAGS@
 CXXFLAGS      := @CXXFLAGS@
 COMPILE       := $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) \
                  $(sprojs_include)
+COMPILE_C     := $(CC)  -MMD -MP $(CPPFLAGS) $(CXXFLAGS) \
+                 $(sprojs_include)
 # Linker
 #  - LDFLAGS : Flags for the linker (eg. -L)
 #  - LIBS    : Library flags (eg. -l)
@@ -169,7 +172,7 @@ define subproject_template
 # system will create a library for this subproject with just the
 # corresponding dummy object file.
 
-ifeq ($$(strip $$($(2)_srcs)),)
+ifeq ($$(strip $$($(2)_srcs) $$($(2)_c_srcs)),)
 $(2)_srcs += _$(1).cc
 $(2)_junk += _$(1).cc
 endif
@@ -180,15 +183,19 @@ _$(1).cc :
 # Build the object files for this subproject
 
 $(2)_objs := $$(patsubst %.cc, %.o, $$($(2)_srcs))
+$(2)_c_objs := $$(patsubst %.c, %.o, $$($(2)_c_srcs))
 $(2)_deps := $$(patsubst %.o, %.d, $$($(2)_objs))
+$(2)_c_deps := $$(patsubst %.o, %.d, $$($(2)_c_objs))
 $$($(2)_objs) : %.o : %.cc
 	$(COMPILE) -c $$<
+$$($(2)_c_objs) : %.o : %.c
+	$(COMPILE_C) -c $$<
 
-$(2)_junk += $$($(2)_objs) $$($(2)_deps)
+$(2)_junk += $$($(2)_objs) $$($(2)_c_objs) $$($(2)_deps) $$($(2)_c_deps)
 
 # Build a library for this subproject
 
-lib$(1).a : $$($(2)_objs)
+lib$(1).a : $$($(2)_objs) $$($(2)_c_objs)
 	$(AR) rcv $$@ $$^
 	$(RANLIB) $$@
 
diff --git a/softfloat/f32_add.cc b/softfloat/f32_add.c
index dc53d68..dc53d68 100755
--- a/softfloat/f32_add.cc
+++ b/softfloat/f32_add.c
diff --git a/softfloat/f32_div.cc b/softfloat/f32_div.c
index 958b140..958b140 100755
--- a/softfloat/f32_div.cc
+++ b/softfloat/f32_div.c
diff --git a/softfloat/f32_eq.cc b/softfloat/f32_eq.c
index 8f2306b..8f2306b 100755
--- a/softfloat/f32_eq.cc
+++ b/softfloat/f32_eq.c
diff --git a/softfloat/f32_eq_signaling.cc b/softfloat/f32_eq_signaling.c
index bfba48a..bfba48a 100755
--- a/softfloat/f32_eq_signaling.cc
+++ b/softfloat/f32_eq_signaling.c
diff --git a/softfloat/f32_isSignalingNaN.cc b/softfloat/f32_isSignalingNaN.c
index 09aaa82..09aaa82 100755
--- a/softfloat/f32_isSignalingNaN.cc
+++ b/softfloat/f32_isSignalingNaN.c
diff --git a/softfloat/f32_le.cc b/softfloat/f32_le.c
index 5f47be5..5f47be5 100755
--- a/softfloat/f32_le.cc
+++ b/softfloat/f32_le.c
diff --git a/softfloat/f32_le_quiet.cc b/softfloat/f32_le_quiet.c
index 2b541da..2b541da 100755
--- a/softfloat/f32_le_quiet.cc
+++ b/softfloat/f32_le_quiet.c
diff --git a/softfloat/f32_lt.cc b/softfloat/f32_lt.c
index 753b28a..753b28a 100755
--- a/softfloat/f32_lt.cc
+++ b/softfloat/f32_lt.c
diff --git a/softfloat/f32_lt_quiet.cc b/softfloat/f32_lt_quiet.c
index ecd90bf..ecd90bf 100755
--- a/softfloat/f32_lt_quiet.cc
+++ b/softfloat/f32_lt_quiet.c
diff --git a/softfloat/f32_mul.cc b/softfloat/f32_mul.c
index d49c1dd..d49c1dd 100755
--- a/softfloat/f32_mul.cc
+++ b/softfloat/f32_mul.c
diff --git a/softfloat/f32_mulAdd.cc b/softfloat/f32_mulAdd.c
index 3d4cee9..3d4cee9 100755
--- a/softfloat/f32_mulAdd.cc
+++ b/softfloat/f32_mulAdd.c
diff --git a/softfloat/f32_rem.cc b/softfloat/f32_rem.c
index d29b840..d29b840 100755
--- a/softfloat/f32_rem.cc
+++ b/softfloat/f32_rem.c
diff --git a/softfloat/f32_roundToInt.cc b/softfloat/f32_roundToInt.c
index f8f9114..f8f9114 100755
--- a/softfloat/f32_roundToInt.cc
+++ b/softfloat/f32_roundToInt.c
diff --git a/softfloat/f32_sqrt.cc b/softfloat/f32_sqrt.c
index c9eb907..c9eb907 100755
--- a/softfloat/f32_sqrt.cc
+++ b/softfloat/f32_sqrt.c
diff --git a/softfloat/f32_sub.cc b/softfloat/f32_sub.c
index c64df8e..c64df8e 100755
--- a/softfloat/f32_sub.cc
+++ b/softfloat/f32_sub.c
diff --git a/softfloat/f32_to_f64.cc b/softfloat/f32_to_f64.c
index 9f0ae5c..9f0ae5c 100755
--- a/softfloat/f32_to_f64.cc
+++ b/softfloat/f32_to_f64.c
diff --git a/softfloat/f32_to_i32.cc b/softfloat/f32_to_i32.c
index bbbaee0..bbbaee0 100755
--- a/softfloat/f32_to_i32.cc
+++ b/softfloat/f32_to_i32.c
diff --git a/softfloat/f32_to_i32_r_minMag.cc b/softfloat/f32_to_i32_r_minMag.c
index 63ff1e2..63ff1e2 100755
--- a/softfloat/f32_to_i32_r_minMag.cc
+++ b/softfloat/f32_to_i32_r_minMag.c
diff --git a/softfloat/f32_to_i64.cc b/softfloat/f32_to_i64.c
index c0b8981..c0b8981 100755
--- a/softfloat/f32_to_i64.cc
+++ b/softfloat/f32_to_i64.c
diff --git a/softfloat/f32_to_i64_r_minMag.cc b/softfloat/f32_to_i64_r_minMag.c
index 33bff93..33bff93 100755
--- a/softfloat/f32_to_i64_r_minMag.cc
+++ b/softfloat/f32_to_i64_r_minMag.c
diff --git a/softfloat/f32_to_ui32.cc b/softfloat/f32_to_ui32.c
index 3501db8..3501db8 100755
--- a/softfloat/f32_to_ui32.cc
+++ b/softfloat/f32_to_ui32.c
diff --git a/softfloat/f32_to_ui32_r_minMag.cc b/softfloat/f32_to_ui32_r_minMag.c
index edd858d..edd858d 100755
--- a/softfloat/f32_to_ui32_r_minMag.cc
+++ b/softfloat/f32_to_ui32_r_minMag.c
diff --git a/softfloat/f32_to_ui64.cc b/softfloat/f32_to_ui64.c
index 6cdcf74..6cdcf74 100755
--- a/softfloat/f32_to_ui64.cc
+++ b/softfloat/f32_to_ui64.c
diff --git a/softfloat/f32_to_ui64_r_minMag.cc b/softfloat/f32_to_ui64_r_minMag.c
index 738d6b1..738d6b1 100755
--- a/softfloat/f32_to_ui64_r_minMag.cc
+++ b/softfloat/f32_to_ui64_r_minMag.c
diff --git a/softfloat/f64_add.cc b/softfloat/f64_add.c
index 9ec4b5f..9ec4b5f 100755
--- a/softfloat/f64_add.cc
+++ b/softfloat/f64_add.c
diff --git a/softfloat/f64_div.cc b/softfloat/f64_div.c
index 9bc72b3..9bc72b3 100755
--- a/softfloat/f64_div.cc
+++ b/softfloat/f64_div.c
diff --git a/softfloat/f64_eq.cc b/softfloat/f64_eq.c
index 925aabc..925aabc 100755
--- a/softfloat/f64_eq.cc
+++ b/softfloat/f64_eq.c
diff --git a/softfloat/f64_eq_signaling.cc b/softfloat/f64_eq_signaling.c
index 7a54dc1..7a54dc1 100755
--- a/softfloat/f64_eq_signaling.cc
+++ b/softfloat/f64_eq_signaling.c
diff --git a/softfloat/f64_isSignalingNaN.cc b/softfloat/f64_isSignalingNaN.c
index d720ac1..d720ac1 100755
--- a/softfloat/f64_isSignalingNaN.cc
+++ b/softfloat/f64_isSignalingNaN.c
diff --git a/softfloat/f64_le.cc b/softfloat/f64_le.c
index e6c5caf..e6c5caf 100755
--- a/softfloat/f64_le.cc
+++ b/softfloat/f64_le.c
diff --git a/softfloat/f64_le_quiet.cc b/softfloat/f64_le_quiet.c
index e9b7ede..e9b7ede 100755
--- a/softfloat/f64_le_quiet.cc
+++ b/softfloat/f64_le_quiet.c
diff --git a/softfloat/f64_lt.cc b/softfloat/f64_lt.c
index 1b2f696..1b2f696 100755
--- a/softfloat/f64_lt.cc
+++ b/softfloat/f64_lt.c
diff --git a/softfloat/f64_lt_quiet.cc b/softfloat/f64_lt_quiet.c
index f27e6da..f27e6da 100755
--- a/softfloat/f64_lt_quiet.cc
+++ b/softfloat/f64_lt_quiet.c
diff --git a/softfloat/f64_mul.cc b/softfloat/f64_mul.c
index 4b5dc4e..4b5dc4e 100755
--- a/softfloat/f64_mul.cc
+++ b/softfloat/f64_mul.c
diff --git a/softfloat/f64_mulAdd.cc b/softfloat/f64_mulAdd.c
index fa1669a..fa1669a 100755
--- a/softfloat/f64_mulAdd.cc
+++ b/softfloat/f64_mulAdd.c
diff --git a/softfloat/f64_rem.cc b/softfloat/f64_rem.c
index 08fcd78..08fcd78 100755
--- a/softfloat/f64_rem.cc
+++ b/softfloat/f64_rem.c
diff --git a/softfloat/f64_roundToInt.cc b/softfloat/f64_roundToInt.c
index ef16dfa..ef16dfa 100755
--- a/softfloat/f64_roundToInt.cc
+++ b/softfloat/f64_roundToInt.c
diff --git a/softfloat/f64_sqrt.cc b/softfloat/f64_sqrt.c
index cd91010..cd91010 100755
--- a/softfloat/f64_sqrt.cc
+++ b/softfloat/f64_sqrt.c
diff --git a/softfloat/f64_sub.cc b/softfloat/f64_sub.c
index 38bd574..38bd574 100755
--- a/softfloat/f64_sub.cc
+++ b/softfloat/f64_sub.c
diff --git a/softfloat/f64_to_f32.cc b/softfloat/f64_to_f32.c
index 395d6c6..395d6c6 100755
--- a/softfloat/f64_to_f32.cc
+++ b/softfloat/f64_to_f32.c
diff --git a/softfloat/f64_to_i32.cc b/softfloat/f64_to_i32.c
index 0778a86..0778a86 100755
--- a/softfloat/f64_to_i32.cc
+++ b/softfloat/f64_to_i32.c
diff --git a/softfloat/f64_to_i32_r_minMag.cc b/softfloat/f64_to_i32_r_minMag.c
index 39246c2..39246c2 100755
--- a/softfloat/f64_to_i32_r_minMag.cc
+++ b/softfloat/f64_to_i32_r_minMag.c
diff --git a/softfloat/f64_to_i64.cc b/softfloat/f64_to_i64.c
index 89663ee..89663ee 100755
--- a/softfloat/f64_to_i64.cc
+++ b/softfloat/f64_to_i64.c
diff --git a/softfloat/f64_to_i64_r_minMag.cc b/softfloat/f64_to_i64_r_minMag.c
index 525705b..525705b 100755
--- a/softfloat/f64_to_i64_r_minMag.cc
+++ b/softfloat/f64_to_i64_r_minMag.c
diff --git a/softfloat/f64_to_ui32.cc b/softfloat/f64_to_ui32.c
index b186605..b186605 100755
--- a/softfloat/f64_to_ui32.cc
+++ b/softfloat/f64_to_ui32.c
diff --git a/softfloat/f64_to_ui32_r_minMag.cc b/softfloat/f64_to_ui32_r_minMag.c
index 9f1dd4d..9f1dd4d 100755
--- a/softfloat/f64_to_ui32_r_minMag.cc
+++ b/softfloat/f64_to_ui32_r_minMag.c
diff --git a/softfloat/f64_to_ui64.cc b/softfloat/f64_to_ui64.c
index 9afebd7..9afebd7 100755
--- a/softfloat/f64_to_ui64.cc
+++ b/softfloat/f64_to_ui64.c
diff --git a/softfloat/f64_to_ui64_r_minMag.cc b/softfloat/f64_to_ui64_r_minMag.c
index a66d3ff..a66d3ff 100755
--- a/softfloat/f64_to_ui64_r_minMag.cc
+++ b/softfloat/f64_to_ui64_r_minMag.c
diff --git a/softfloat/i32_to_f32.cc b/softfloat/i32_to_f32.c
index f51facd..f51facd 100755
--- a/softfloat/i32_to_f32.cc
+++ b/softfloat/i32_to_f32.c
diff --git a/softfloat/i32_to_f64.cc b/softfloat/i32_to_f64.c
index d42cbe8..d42cbe8 100755
--- a/softfloat/i32_to_f64.cc
+++ b/softfloat/i32_to_f64.c
diff --git a/softfloat/i64_to_f32.cc b/softfloat/i64_to_f32.c
index 4fecbb9..4fecbb9 100755
--- a/softfloat/i64_to_f32.cc
+++ b/softfloat/i64_to_f32.c
diff --git a/softfloat/i64_to_f64.cc b/softfloat/i64_to_f64.c
index 1add960..1add960 100755
--- a/softfloat/i64_to_f64.cc
+++ b/softfloat/i64_to_f64.c
diff --git a/softfloat/s_add128.cc b/softfloat/s_add128.c
index 59c0348..59c0348 100755
--- a/softfloat/s_add128.cc
+++ b/softfloat/s_add128.c
diff --git a/softfloat/s_add192.cc b/softfloat/s_add192.c
index 543eb5d..543eb5d 100755
--- a/softfloat/s_add192.cc
+++ b/softfloat/s_add192.c
diff --git a/softfloat/s_addMagsF32.cc b/softfloat/s_addMagsF32.c
index f361e2b..f361e2b 100755
--- a/softfloat/s_addMagsF32.cc
+++ b/softfloat/s_addMagsF32.c
diff --git a/softfloat/s_addMagsF64.cc b/softfloat/s_addMagsF64.c
index a81c3e4..a81c3e4 100755
--- a/softfloat/s_addMagsF64.cc
+++ b/softfloat/s_addMagsF64.c
diff --git a/softfloat/s_countLeadingZeros32.cc b/softfloat/s_countLeadingZeros32.c
index 0bd17e1..0bd17e1 100755
--- a/softfloat/s_countLeadingZeros32.cc
+++ b/softfloat/s_countLeadingZeros32.c
diff --git a/softfloat/s_countLeadingZeros64.cc b/softfloat/s_countLeadingZeros64.c
index 79f4280..79f4280 100755
--- a/softfloat/s_countLeadingZeros64.cc
+++ b/softfloat/s_countLeadingZeros64.c
diff --git a/softfloat/s_countLeadingZeros8.cc b/softfloat/s_countLeadingZeros8.c
index 4eca7e9..4eca7e9 100755
--- a/softfloat/s_countLeadingZeros8.cc
+++ b/softfloat/s_countLeadingZeros8.c
diff --git a/softfloat/s_eq128.cc b/softfloat/s_eq128.c
index 7261dc4..7261dc4 100755
--- a/softfloat/s_eq128.cc
+++ b/softfloat/s_eq128.c
diff --git a/softfloat/s_estimateDiv128To64.cc b/softfloat/s_estimateDiv128To64.c
index f8610a2..f8610a2 100755
--- a/softfloat/s_estimateDiv128To64.cc
+++ b/softfloat/s_estimateDiv128To64.c
diff --git a/softfloat/s_estimateSqrt32.cc b/softfloat/s_estimateSqrt32.c
index e22a9dc..e22a9dc 100755
--- a/softfloat/s_estimateSqrt32.cc
+++ b/softfloat/s_estimateSqrt32.c
diff --git a/softfloat/s_le128.cc b/softfloat/s_le128.c
index 83b1d7f..83b1d7f 100755
--- a/softfloat/s_le128.cc
+++ b/softfloat/s_le128.c
diff --git a/softfloat/s_lt128.cc b/softfloat/s_lt128.c
index 33a3df4..33a3df4 100755
--- a/softfloat/s_lt128.cc
+++ b/softfloat/s_lt128.c
diff --git a/softfloat/s_mul128By64To192.cc b/softfloat/s_mul128By64To192.c
index dfa8825..dfa8825 100755
--- a/softfloat/s_mul128By64To192.cc
+++ b/softfloat/s_mul128By64To192.c
diff --git a/softfloat/s_mul128To256.cc b/softfloat/s_mul128To256.c
index a96cd94..a96cd94 100755
--- a/softfloat/s_mul128To256.cc
+++ b/softfloat/s_mul128To256.c
diff --git a/softfloat/s_mul64To128.cc b/softfloat/s_mul64To128.c
index c17780b..c17780b 100755
--- a/softfloat/s_mul64To128.cc
+++ b/softfloat/s_mul64To128.c
diff --git a/softfloat/s_mulAddF32.cc b/softfloat/s_mulAddF32.c
index e55a0ba..e55a0ba 100755
--- a/softfloat/s_mulAddF32.cc
+++ b/softfloat/s_mulAddF32.c
diff --git a/softfloat/s_mulAddF64.cc b/softfloat/s_mulAddF64.c
index 01ba3b4..01ba3b4 100755
--- a/softfloat/s_mulAddF64.cc
+++ b/softfloat/s_mulAddF64.c
diff --git a/softfloat/s_normRoundPackToF32.cc b/softfloat/s_normRoundPackToF32.c
index 2e6f4b0..2e6f4b0 100755
--- a/softfloat/s_normRoundPackToF32.cc
+++ b/softfloat/s_normRoundPackToF32.c
diff --git a/softfloat/s_normRoundPackToF64.cc b/softfloat/s_normRoundPackToF64.c
index 64dced4..64dced4 100755
--- a/softfloat/s_normRoundPackToF64.cc
+++ b/softfloat/s_normRoundPackToF64.c
diff --git a/softfloat/s_normSubnormalF32Sig.cc b/softfloat/s_normSubnormalF32Sig.c
index b98eb86..b98eb86 100755
--- a/softfloat/s_normSubnormalF32Sig.cc
+++ b/softfloat/s_normSubnormalF32Sig.c
diff --git a/softfloat/s_normSubnormalF64Sig.cc b/softfloat/s_normSubnormalF64Sig.c
index 45a7c9e..45a7c9e 100755
--- a/softfloat/s_normSubnormalF64Sig.cc
+++ b/softfloat/s_normSubnormalF64Sig.c
diff --git a/softfloat/s_roundPackToF32.cc b/softfloat/s_roundPackToF32.c
index 11764f1..11764f1 100755
--- a/softfloat/s_roundPackToF32.cc
+++ b/softfloat/s_roundPackToF32.c
diff --git a/softfloat/s_roundPackToF64.cc b/softfloat/s_roundPackToF64.c
index fb0ef1d..fb0ef1d 100755
--- a/softfloat/s_roundPackToF64.cc
+++ b/softfloat/s_roundPackToF64.c
diff --git a/softfloat/s_roundPackToI32.cc b/softfloat/s_roundPackToI32.c
index 1c91497..1c91497 100755
--- a/softfloat/s_roundPackToI32.cc
+++ b/softfloat/s_roundPackToI32.c
diff --git a/softfloat/s_roundPackToI64.cc b/softfloat/s_roundPackToI64.c
index b2f5d63..b2f5d63 100755
--- a/softfloat/s_roundPackToI64.cc
+++ b/softfloat/s_roundPackToI64.c
diff --git a/softfloat/s_roundPackToUI32.cc b/softfloat/s_roundPackToUI32.c
index ab44ec7..ab44ec7 100755
--- a/softfloat/s_roundPackToUI32.cc
+++ b/softfloat/s_roundPackToUI32.c
diff --git a/softfloat/s_roundPackToUI64.cc b/softfloat/s_roundPackToUI64.c
index d42266f..d42266f 100755
--- a/softfloat/s_roundPackToUI64.cc
+++ b/softfloat/s_roundPackToUI64.c
diff --git a/softfloat/s_shift128ExtraRightJam.cc b/softfloat/s_shift128ExtraRightJam.c
index 6c57974..6c57974 100755
--- a/softfloat/s_shift128ExtraRightJam.cc
+++ b/softfloat/s_shift128ExtraRightJam.c
diff --git a/softfloat/s_shift128RightJam.cc b/softfloat/s_shift128RightJam.c
index 5a4e188..5a4e188 100755
--- a/softfloat/s_shift128RightJam.cc
+++ b/softfloat/s_shift128RightJam.c
diff --git a/softfloat/s_shift32RightJam.cc b/softfloat/s_shift32RightJam.c
index b697a34..b697a34 100755
--- a/softfloat/s_shift32RightJam.cc
+++ b/softfloat/s_shift32RightJam.c
diff --git a/softfloat/s_shift64ExtraRightJam.cc b/softfloat/s_shift64ExtraRightJam.c
index 167ea54..167ea54 100755
--- a/softfloat/s_shift64ExtraRightJam.cc
+++ b/softfloat/s_shift64ExtraRightJam.c
diff --git a/softfloat/s_shift64RightJam.cc b/softfloat/s_shift64RightJam.c
index ebebb61..ebebb61 100755
--- a/softfloat/s_shift64RightJam.cc
+++ b/softfloat/s_shift64RightJam.c
diff --git a/softfloat/s_shortShift128ExtraRightJam.cc b/softfloat/s_shortShift128ExtraRightJam.c
index c772740..c772740 100755
--- a/softfloat/s_shortShift128ExtraRightJam.cc
+++ b/softfloat/s_shortShift128ExtraRightJam.c
diff --git a/softfloat/s_shortShift128Left.cc b/softfloat/s_shortShift128Left.c
index 9c29988..9c29988 100755
--- a/softfloat/s_shortShift128Left.cc
+++ b/softfloat/s_shortShift128Left.c
diff --git a/softfloat/s_shortShift128Right.cc b/softfloat/s_shortShift128Right.c
index f7f4ce8..f7f4ce8 100755
--- a/softfloat/s_shortShift128Right.cc
+++ b/softfloat/s_shortShift128Right.c
diff --git a/softfloat/s_shortShift192Left.cc b/softfloat/s_shortShift192Left.c
index cf1e55d..cf1e55d 100755
--- a/softfloat/s_shortShift192Left.cc
+++ b/softfloat/s_shortShift192Left.c
diff --git a/softfloat/s_shortShift32Right1Jam.cc b/softfloat/s_shortShift32Right1Jam.c
index db4c304..db4c304 100755
--- a/softfloat/s_shortShift32Right1Jam.cc
+++ b/softfloat/s_shortShift32Right1Jam.c
diff --git a/softfloat/s_shortShift64ExtraRightJam.cc b/softfloat/s_shortShift64ExtraRightJam.c
index b861c67..b861c67 100755
--- a/softfloat/s_shortShift64ExtraRightJam.cc
+++ b/softfloat/s_shortShift64ExtraRightJam.c
diff --git a/softfloat/s_shortShift64RightJam.cc b/softfloat/s_shortShift64RightJam.c
index 0da6c93..0da6c93 100755
--- a/softfloat/s_shortShift64RightJam.cc
+++ b/softfloat/s_shortShift64RightJam.c
diff --git a/softfloat/s_sub128.cc b/softfloat/s_sub128.c
index 0c4f181..0c4f181 100755
--- a/softfloat/s_sub128.cc
+++ b/softfloat/s_sub128.c
diff --git a/softfloat/s_sub192.cc b/softfloat/s_sub192.c
index 96f21c9..96f21c9 100755
--- a/softfloat/s_sub192.cc
+++ b/softfloat/s_sub192.c
diff --git a/softfloat/s_subMagsF32.cc b/softfloat/s_subMagsF32.c
index 0c83b02..0c83b02 100755
--- a/softfloat/s_subMagsF32.cc
+++ b/softfloat/s_subMagsF32.c
diff --git a/softfloat/s_subMagsF64.cc b/softfloat/s_subMagsF64.c
index 45b81ba..45b81ba 100755
--- a/softfloat/s_subMagsF64.cc
+++ b/softfloat/s_subMagsF64.c
diff --git a/softfloat/softfloat.h b/softfloat/softfloat.h
index a7ea248..3eddeed 100755
--- a/softfloat/softfloat.h
+++ b/softfloat/softfloat.h
@@ -2,6 +2,10 @@
 #ifndef softfloat_h

 #define softfloat_h

 

+#ifdef __cplusplus

+extern "C" {

+#endif

+

 /*** UPDATE COMMENTS. ***/

 

 /*============================================================================

@@ -221,5 +225,9 @@ bool f128_le_quiet( float128_t, float128_t );
 bool f128_lt_quiet( float128_t, float128_t );

 bool f128_isSignalingNaN( float128_t );

 

+#ifdef __cplusplus

+}

+#endif

+

 #endif

 

diff --git a/softfloat/softfloat.mk.in b/softfloat/softfloat.mk.in
index 964bc47..59993cb 100644
--- a/softfloat/softfloat.mk.in
+++ b/softfloat/softfloat.mk.in
@@ -6,107 +6,107 @@ softfloat_hdrs = \
 	primitives.h \
 	softfloat.h \
 
-softfloat_srcs = \
-	f32_add.cc                      \
-	f32_div.cc                      \
-	f32_eq.cc                       \
-	f32_eq_signaling.cc             \
-	f32_isSignalingNaN.cc           \
-	f32_le.cc                       \
-	f32_le_quiet.cc                 \
-	f32_lt.cc                       \
-	f32_lt_quiet.cc                 \
-	f32_mulAdd.cc                   \
-	f32_mul.cc                      \
-	f32_rem.cc                      \
-	f32_roundToInt.cc               \
-	f32_sqrt.cc                     \
-	f32_sub.cc                      \
-	f32_to_f64.cc                   \
-	f32_to_i32.cc                   \
-	f32_to_i32_r_minMag.cc          \
-	f32_to_i64.cc                   \
-	f32_to_i64_r_minMag.cc          \
-	f32_to_ui32.cc                  \
-	f32_to_ui32_r_minMag.cc         \
-	f32_to_ui64.cc                  \
-	f32_to_ui64_r_minMag.cc         \
-	f64_add.cc                      \
-	f64_div.cc                      \
-	f64_eq.cc                       \
-	f64_eq_signaling.cc             \
-	f64_isSignalingNaN.cc           \
-	f64_le.cc                       \
-	f64_le_quiet.cc                 \
-	f64_lt.cc                       \
-	f64_lt_quiet.cc                 \
-	f64_mulAdd.cc                   \
-	f64_mul.cc                      \
-	f64_rem.cc                      \
-	f64_roundToInt.cc               \
-	f64_sqrt.cc                     \
-	f64_sub.cc                      \
-	f64_to_f32.cc                   \
-	f64_to_i32.cc                   \
-	f64_to_i32_r_minMag.cc          \
-	f64_to_i64.cc                   \
-	f64_to_i64_r_minMag.cc          \
-	f64_to_ui32.cc                  \
-	f64_to_ui32_r_minMag.cc         \
-	f64_to_ui64.cc                  \
-	f64_to_ui64_r_minMag.cc         \
-	i32_to_f32.cc                   \
-	i32_to_f64.cc                   \
-	i64_to_f32.cc                   \
-	i64_to_f64.cc                   \
-	s_add128.cc                     \
-	s_add192.cc                     \
-	s_addMagsF32.cc                 \
-	s_addMagsF64.cc                 \
-	s_countLeadingZeros32.cc        \
-	s_countLeadingZeros64.cc        \
-	s_countLeadingZeros8.cc         \
-	s_eq128.cc                      \
-	s_estimateDiv128To64.cc         \
-	s_estimateSqrt32.cc             \
-	s_le128.cc                      \
-	s_lt128.cc                      \
-	s_mul128By64To192.cc            \
-	s_mul128To256.cc                \
-	s_mul64To128.cc                 \
-	s_mulAddF32.cc                  \
-	s_mulAddF64.cc                  \
-	s_normRoundPackToF32.cc         \
-	s_normRoundPackToF64.cc         \
-	s_normSubnormalF32Sig.cc        \
-	s_normSubnormalF64Sig.cc        \
-	softfloat_state.cc              \
-	s_roundPackToF32.cc             \
-	s_roundPackToF64.cc             \
-	s_roundPackToI32.cc             \
-	s_roundPackToI64.cc             \
-	s_roundPackToUI32.cc            \
-	s_roundPackToUI64.cc            \
-	s_shift128ExtraRightJam.cc      \
-	s_shift128RightJam.cc           \
-	s_shift32RightJam.cc            \
-	s_shift64ExtraRightJam.cc       \
-	s_shift64RightJam.cc            \
-	s_shortShift128ExtraRightJam.cc \
-	s_shortShift128Left.cc          \
-	s_shortShift128Right.cc         \
-	s_shortShift192Left.cc          \
-	s_shortShift32Right1Jam.cc      \
-	s_shortShift64ExtraRightJam.cc  \
-	s_shortShift64RightJam.cc       \
-	s_sub128.cc                     \
-	s_sub192.cc                     \
-	s_subMagsF32.cc                 \
-	s_subMagsF64.cc                 \
-	ui32_to_f32.cc                  \
-	ui32_to_f64.cc                  \
-	ui64_to_f32.cc                  \
-	ui64_to_f64.cc                  \
+softfloat_c_srcs = \
+	f32_add.c                      \
+	f32_div.c                      \
+	f32_eq.c                       \
+	f32_eq_signaling.c             \
+	f32_isSignalingNaN.c           \
+	f32_le.c                       \
+	f32_le_quiet.c                 \
+	f32_lt.c                       \
+	f32_lt_quiet.c                 \
+	f32_mulAdd.c                   \
+	f32_mul.c                      \
+	f32_rem.c                      \
+	f32_roundToInt.c               \
+	f32_sqrt.c                     \
+	f32_sub.c                      \
+	f32_to_f64.c                   \
+	f32_to_i32.c                   \
+	f32_to_i32_r_minMag.c          \
+	f32_to_i64.c                   \
+	f32_to_i64_r_minMag.c          \
+	f32_to_ui32.c                  \
+	f32_to_ui32_r_minMag.c         \
+	f32_to_ui64.c                  \
+	f32_to_ui64_r_minMag.c         \
+	f64_add.c                      \
+	f64_div.c                      \
+	f64_eq.c                       \
+	f64_eq_signaling.c             \
+	f64_isSignalingNaN.c           \
+	f64_le.c                       \
+	f64_le_quiet.c                 \
+	f64_lt.c                       \
+	f64_lt_quiet.c                 \
+	f64_mulAdd.c                   \
+	f64_mul.c                      \
+	f64_rem.c                      \
+	f64_roundToInt.c               \
+	f64_sqrt.c                     \
+	f64_sub.c                      \
+	f64_to_f32.c                   \
+	f64_to_i32.c                   \
+	f64_to_i32_r_minMag.c          \
+	f64_to_i64.c                   \
+	f64_to_i64_r_minMag.c          \
+	f64_to_ui32.c                  \
+	f64_to_ui32_r_minMag.c         \
+	f64_to_ui64.c                  \
+	f64_to_ui64_r_minMag.c         \
+	i32_to_f32.c                   \
+	i32_to_f64.c                   \
+	i64_to_f32.c                   \
+	i64_to_f64.c                   \
+	s_add128.c                     \
+	s_add192.c                     \
+	s_addMagsF32.c                 \
+	s_addMagsF64.c                 \
+	s_countLeadingZeros32.c        \
+	s_countLeadingZeros64.c        \
+	s_countLeadingZeros8.c         \
+	s_eq128.c                      \
+	s_estimateDiv128To64.c         \
+	s_estimateSqrt32.c             \
+	s_le128.c                      \
+	s_lt128.c                      \
+	s_mul128By64To192.c            \
+	s_mul128To256.c                \
+	s_mul64To128.c                 \
+	s_mulAddF32.c                  \
+	s_mulAddF64.c                  \
+	s_normRoundPackToF32.c         \
+	s_normRoundPackToF64.c         \
+	s_normSubnormalF32Sig.c        \
+	s_normSubnormalF64Sig.c        \
+	softfloat_state.c              \
+	s_roundPackToF32.c             \
+	s_roundPackToF64.c             \
+	s_roundPackToI32.c             \
+	s_roundPackToI64.c             \
+	s_roundPackToUI32.c            \
+	s_roundPackToUI64.c            \
+	s_shift128ExtraRightJam.c      \
+	s_shift128RightJam.c           \
+	s_shift32RightJam.c            \
+	s_shift64ExtraRightJam.c       \
+	s_shift64RightJam.c            \
+	s_shortShift128ExtraRightJam.c \
+	s_shortShift128Left.c          \
+	s_shortShift128Right.c         \
+	s_shortShift192Left.c          \
+	s_shortShift32Right1Jam.c      \
+	s_shortShift64ExtraRightJam.c  \
+	s_shortShift64RightJam.c       \
+	s_sub128.c                     \
+	s_sub192.c                     \
+	s_subMagsF32.c                 \
+	s_subMagsF64.c                 \
+	ui32_to_f32.c                  \
+	ui32_to_f64.c                  \
+	ui64_to_f32.c                  \
+	ui64_to_f64.c                  \
 
 softfloat_test_srcs =
 
diff --git a/softfloat/softfloat_state.cc b/softfloat/softfloat_state.c
index 8859089..8859089 100755
--- a/softfloat/softfloat_state.cc
+++ b/softfloat/softfloat_state.c
diff --git a/softfloat/ui32_to_f32.cc b/softfloat/ui32_to_f32.c
index ba0fc1a..ba0fc1a 100755
--- a/softfloat/ui32_to_f32.cc
+++ b/softfloat/ui32_to_f32.c
diff --git a/softfloat/ui32_to_f64.cc b/softfloat/ui32_to_f64.c
index d0bd177..d0bd177 100755
--- a/softfloat/ui32_to_f64.cc
+++ b/softfloat/ui32_to_f64.c
diff --git a/softfloat/ui64_to_f32.cc b/softfloat/ui64_to_f32.c
index 82afbdc..82afbdc 100755
--- a/softfloat/ui64_to_f32.cc
+++ b/softfloat/ui64_to_f32.c
diff --git a/softfloat/ui64_to_f64.cc b/softfloat/ui64_to_f64.c
index 52c158b..52c158b 100755
--- a/softfloat/ui64_to_f64.cc
+++ b/softfloat/ui64_to_f64.c
diff --git a/softfloat_riscv/s_commonNaNToF32UI.cc b/softfloat_riscv/s_commonNaNToF32UI.c
index 61f2735..61f2735 100755
--- a/softfloat_riscv/s_commonNaNToF32UI.cc
+++ b/softfloat_riscv/s_commonNaNToF32UI.c
diff --git a/softfloat_riscv/s_commonNaNToF64UI.cc b/softfloat_riscv/s_commonNaNToF64UI.c
index da36c04..da36c04 100755
--- a/softfloat_riscv/s_commonNaNToF64UI.cc
+++ b/softfloat_riscv/s_commonNaNToF64UI.c
diff --git a/softfloat_riscv/s_f32UIToCommonNaN.cc b/softfloat_riscv/s_f32UIToCommonNaN.c
index 9ee0db9..9ee0db9 100755
--- a/softfloat_riscv/s_f32UIToCommonNaN.cc
+++ b/softfloat_riscv/s_f32UIToCommonNaN.c
diff --git a/softfloat_riscv/s_f64UIToCommonNaN.cc b/softfloat_riscv/s_f64UIToCommonNaN.c
index 84d8ca0..84d8ca0 100755
--- a/softfloat_riscv/s_f64UIToCommonNaN.cc
+++ b/softfloat_riscv/s_f64UIToCommonNaN.c
diff --git a/softfloat_riscv/s_isSigNaNF32UI.cc b/softfloat_riscv/s_isSigNaNF32UI.c
index 0a9c33f..0a9c33f 100755
--- a/softfloat_riscv/s_isSigNaNF32UI.cc
+++ b/softfloat_riscv/s_isSigNaNF32UI.c
diff --git a/softfloat_riscv/s_isSigNaNF64UI.cc b/softfloat_riscv/s_isSigNaNF64UI.c
index d255213..d255213 100755
--- a/softfloat_riscv/s_isSigNaNF64UI.cc
+++ b/softfloat_riscv/s_isSigNaNF64UI.c
diff --git a/softfloat_riscv/s_propagateNaNF32UI.cc b/softfloat_riscv/s_propagateNaNF32UI.c
index 07774e8..07774e8 100755
--- a/softfloat_riscv/s_propagateNaNF32UI.cc
+++ b/softfloat_riscv/s_propagateNaNF32UI.c
diff --git a/softfloat_riscv/s_propagateNaNF64UI.cc b/softfloat_riscv/s_propagateNaNF64UI.c
index 0ff6446..0ff6446 100755
--- a/softfloat_riscv/s_propagateNaNF64UI.cc
+++ b/softfloat_riscv/s_propagateNaNF64UI.c
diff --git a/softfloat_riscv/softfloat_raiseFlags.cc b/softfloat_riscv/softfloat_raiseFlags.c
index c0c0dc8..c0c0dc8 100755
--- a/softfloat_riscv/softfloat_raiseFlags.cc
+++ b/softfloat_riscv/softfloat_raiseFlags.c
diff --git a/softfloat_riscv/softfloat_riscv.mk.in b/softfloat_riscv/softfloat_riscv.mk.in
index 0b996fb..0b898ed 100644
--- a/softfloat_riscv/softfloat_riscv.mk.in
+++ b/softfloat_riscv/softfloat_riscv.mk.in
@@ -5,16 +5,16 @@ softfloat_riscv_hdrs = \
 	platform.h        \
 	specialize.h      \
 
-softfloat_riscv_srcs = \
-	softfloat_raiseFlags.cc \
-	s_commonNaNToF32UI.cc   \
-	s_commonNaNToF64UI.cc   \
-	s_f32UIToCommonNaN.cc   \
-	s_f64UIToCommonNaN.cc   \
-	s_isSigNaNF32UI.cc      \
-	s_isSigNaNF64UI.cc      \
-	s_propagateNaNF32UI.cc  \
-	s_propagateNaNF64UI.cc  \
+softfloat_riscv_c_srcs = \
+	softfloat_raiseFlags.c \
+	s_commonNaNToF32UI.c   \
+	s_commonNaNToF64UI.c   \
+	s_f32UIToCommonNaN.c   \
+	s_f64UIToCommonNaN.c   \
+	s_isSigNaNF32UI.c      \
+	s_isSigNaNF64UI.c      \
+	s_propagateNaNF32UI.c  \
+	s_propagateNaNF64UI.c  \
 
 softfloat_riscv_test_srcs =