[sim] made softfloat files C instead of C++

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) $$@
 

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
 

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 =