From 017f62ac55a9514d12d47cf608f7f5ca6c1d4973 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Sat, 25 Jan 2014 18:31:32 -0800 Subject: [PATCH] Merge softfloat_riscv into softfloat They really aren't independent libraries. --- configure | 46 ------------------- configure.ac | 2 +- riscv/riscv.mk.in | 1 - {softfloat_riscv => softfloat}/platform.h | 0 .../s_commonNaNToF32UI.c | 0 .../s_commonNaNToF64UI.c | 0 .../s_f32UIToCommonNaN.c | 0 .../s_f64UIToCommonNaN.c | 0 .../s_isSigNaNF32UI.c | 0 .../s_isSigNaNF64UI.c | 0 .../s_propagateNaNF32UI.c | 0 .../s_propagateNaNF64UI.c | 0 softfloat/softfloat.mk.in | 13 +++++- .../softfloat_raiseFlags.c | 0 .../softfloat_types.h | 0 {softfloat_riscv => softfloat}/specialize.h | 0 softfloat_riscv/softfloat_riscv.ac | 0 softfloat_riscv/softfloat_riscv.mk.in | 21 --------- 18 files changed, 13 insertions(+), 70 deletions(-) rename {softfloat_riscv => softfloat}/platform.h (100%) rename {softfloat_riscv => softfloat}/s_commonNaNToF32UI.c (100%) rename {softfloat_riscv => softfloat}/s_commonNaNToF64UI.c (100%) rename {softfloat_riscv => softfloat}/s_f32UIToCommonNaN.c (100%) rename {softfloat_riscv => softfloat}/s_f64UIToCommonNaN.c (100%) rename {softfloat_riscv => softfloat}/s_isSigNaNF32UI.c (100%) rename {softfloat_riscv => softfloat}/s_isSigNaNF64UI.c (100%) rename {softfloat_riscv => softfloat}/s_propagateNaNF32UI.c (100%) rename {softfloat_riscv => softfloat}/s_propagateNaNF64UI.c (100%) rename {softfloat_riscv => softfloat}/softfloat_raiseFlags.c (100%) rename {softfloat_riscv => softfloat}/softfloat_types.h (100%) rename {softfloat_riscv => softfloat}/specialize.h (100%) delete mode 100644 softfloat_riscv/softfloat_riscv.ac delete mode 100644 softfloat_riscv/softfloat_riscv.mk.in diff --git a/configure b/configure index 77eef2f..7da38cf 100755 --- a/configure +++ b/configure @@ -4358,51 +4358,6 @@ $as_echo "#define SOFTFLOAT_ENABLED /**/" >>confdefs.h - # Determine if this is a required or an optional subproject - - - - # Determine if there is a group with the same name - - - - # Create variations of the subproject name suitable for use as a CPP - # enabled define, a shell enabled variable, and a shell function - - - - - - - - - - - - # Add subproject to our running list - - subprojects="$subprojects softfloat_riscv" - - # Process the subproject appropriately. If enabled add it to the - # $enabled_subprojects running shell variable, set a - # SUBPROJECT_ENABLED C define, and include the appropriate - # 'subproject.ac'. - - - { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : softfloat_riscv" >&5 -$as_echo "$as_me: configuring default subproject : softfloat_riscv" >&6;} - ac_config_files="$ac_config_files softfloat_riscv.mk:softfloat_riscv/softfloat_riscv.mk.in" - - enable_softfloat_riscv_sproj="yes" - subprojects_enabled="$subprojects_enabled softfloat_riscv" - -$as_echo "#define SOFTFLOAT_RISCV_ENABLED /**/" >>confdefs.h - - - - - - # Output make variables @@ -5134,7 +5089,6 @@ do "riscv.mk") CONFIG_FILES="$CONFIG_FILES riscv.mk:riscv/riscv.mk.in" ;; "hwacha.mk") CONFIG_FILES="$CONFIG_FILES hwacha.mk:hwacha/hwacha.mk.in" ;; "softfloat.mk") CONFIG_FILES="$CONFIG_FILES softfloat.mk:softfloat/softfloat.mk.in" ;; - "softfloat_riscv.mk") CONFIG_FILES="$CONFIG_FILES softfloat_riscv.mk:softfloat_riscv/softfloat_riscv.mk.in" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; diff --git a/configure.ac b/configure.ac index d683cc5..bf35807 100644 --- a/configure.ac +++ b/configure.ac @@ -82,7 +82,7 @@ AC_SUBST([CXXFLAGS],["-Wall -O2 -std=c++11"]) # The '*' suffix indicates an optional subproject. The '**' suffix # indicates an optional subproject which is also the name of a group. -MCPPBS_SUBPROJECTS([ riscv, hwacha, softfloat, softfloat_riscv ]) +MCPPBS_SUBPROJECTS([ riscv, hwacha, softfloat ]) #------------------------------------------------------------------------- # MCPPBS subproject groups diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in index 45c5ee7..92adb8f 100644 --- a/riscv/riscv.mk.in +++ b/riscv/riscv.mk.in @@ -2,7 +2,6 @@ get_insn_list = $(shell grep ^DECLARE_INSN $(1) | sed 's/DECLARE_INSN(\(.*\),.*, get_opcode = $(shell grep ^DECLARE_INSN.*\\\<$(2)\\\> $(1) | sed 's/DECLARE_INSN(.*,\(.*\),.*)/\1/') riscv_subproject_deps = \ - softfloat_riscv \ softfloat \ hwacha \ diff --git a/softfloat_riscv/platform.h b/softfloat/platform.h similarity index 100% rename from softfloat_riscv/platform.h rename to softfloat/platform.h diff --git a/softfloat_riscv/s_commonNaNToF32UI.c b/softfloat/s_commonNaNToF32UI.c similarity index 100% rename from softfloat_riscv/s_commonNaNToF32UI.c rename to softfloat/s_commonNaNToF32UI.c diff --git a/softfloat_riscv/s_commonNaNToF64UI.c b/softfloat/s_commonNaNToF64UI.c similarity index 100% rename from softfloat_riscv/s_commonNaNToF64UI.c rename to softfloat/s_commonNaNToF64UI.c diff --git a/softfloat_riscv/s_f32UIToCommonNaN.c b/softfloat/s_f32UIToCommonNaN.c similarity index 100% rename from softfloat_riscv/s_f32UIToCommonNaN.c rename to softfloat/s_f32UIToCommonNaN.c diff --git a/softfloat_riscv/s_f64UIToCommonNaN.c b/softfloat/s_f64UIToCommonNaN.c similarity index 100% rename from softfloat_riscv/s_f64UIToCommonNaN.c rename to softfloat/s_f64UIToCommonNaN.c diff --git a/softfloat_riscv/s_isSigNaNF32UI.c b/softfloat/s_isSigNaNF32UI.c similarity index 100% rename from softfloat_riscv/s_isSigNaNF32UI.c rename to softfloat/s_isSigNaNF32UI.c diff --git a/softfloat_riscv/s_isSigNaNF64UI.c b/softfloat/s_isSigNaNF64UI.c similarity index 100% rename from softfloat_riscv/s_isSigNaNF64UI.c rename to softfloat/s_isSigNaNF64UI.c diff --git a/softfloat_riscv/s_propagateNaNF32UI.c b/softfloat/s_propagateNaNF32UI.c similarity index 100% rename from softfloat_riscv/s_propagateNaNF32UI.c rename to softfloat/s_propagateNaNF32UI.c diff --git a/softfloat_riscv/s_propagateNaNF64UI.c b/softfloat/s_propagateNaNF64UI.c similarity index 100% rename from softfloat_riscv/s_propagateNaNF64UI.c rename to softfloat/s_propagateNaNF64UI.c diff --git a/softfloat/softfloat.mk.in b/softfloat/softfloat.mk.in index 59993cb..2b29f92 100644 --- a/softfloat/softfloat.mk.in +++ b/softfloat/softfloat.mk.in @@ -1,10 +1,12 @@ softfloat_subproject_deps = \ - sotfloat_riscv \ softfloat_hdrs = \ internals.h \ primitives.h \ softfloat.h \ + softfloat_types.h \ + platform.h \ + specialize.h \ softfloat_c_srcs = \ f32_add.c \ @@ -107,6 +109,15 @@ softfloat_c_srcs = \ ui32_to_f64.c \ ui64_to_f32.c \ ui64_to_f64.c \ + 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_test_srcs = diff --git a/softfloat_riscv/softfloat_raiseFlags.c b/softfloat/softfloat_raiseFlags.c similarity index 100% rename from softfloat_riscv/softfloat_raiseFlags.c rename to softfloat/softfloat_raiseFlags.c diff --git a/softfloat_riscv/softfloat_types.h b/softfloat/softfloat_types.h similarity index 100% rename from softfloat_riscv/softfloat_types.h rename to softfloat/softfloat_types.h diff --git a/softfloat_riscv/specialize.h b/softfloat/specialize.h similarity index 100% rename from softfloat_riscv/specialize.h rename to softfloat/specialize.h diff --git a/softfloat_riscv/softfloat_riscv.ac b/softfloat_riscv/softfloat_riscv.ac deleted file mode 100644 index e69de29..0000000 diff --git a/softfloat_riscv/softfloat_riscv.mk.in b/softfloat_riscv/softfloat_riscv.mk.in deleted file mode 100644 index 0b898ed..0000000 --- a/softfloat_riscv/softfloat_riscv.mk.in +++ /dev/null @@ -1,21 +0,0 @@ -softfloat_riscv_subproject_deps = \ - -softfloat_riscv_hdrs = \ - softfloat_types.h \ - platform.h \ - specialize.h \ - -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 = - -softfloat_riscv_install_prog_srcs = -- 2.30.2