Put back the non-VFP soft float implementations.
These functions are needed for us to compile bionic (libc and libm,
anyway) with compiler-rt instead of libgcc.
Bug: http://b/18389563
Change-Id: I1ba28153bd6f625a955567335d7fccc6e316228f
diff --git a/Android.mk b/Android.mk
index 671ed44..86db630 100644
--- a/Android.mk
+++ b/Android.mk
@@ -295,31 +295,12 @@
$(filter lib/builtins/$(strip $(2))/%.c,$(1))),$(1))
endef
-define get-libcompiler-rt-arm-common-source-files
+define get-libcompiler-rt-arm-source-files
$(call filter-libcompiler-rt-common-source-files,
$(libcompiler_rt_common_SRC_FILES) \
$(libcompiler_rt_arm_SRC_FILES), arm)
endef
-# $(1): common runtime list
-#
-# Add ARM runtimes implemented in VFP
-define add-libcompiler-rt-arm-vfp-source-files
- $(filter-out $(addprefix lib/builtins/,adddf3.c addsf3.c comparedf2.c comparesf2.c \
- arm/comparesf2.S divdf3.c divsf3.c extendsfdf2.c \
- fixdfsi.c fixsfsi.c fixunsdfsi.c fixunssfsi.c \
- floatsidf.c floatsisf.c floatunsidf.c floatunsisf.c \
- muldf3.c mulsf3.c negdf2.c negsf2.c subdf3.c \
- subsf3.c truncdfsf2.c),$(1))
-endef
-
-define get-libcompiler-rt-arm-source-files
- $(if $(findstring $(ARCH_ARM_HAVE_VFP),true),
- $(call add-libcompiler-rt-arm-vfp-source-files,
- $(call get-libcompiler-rt-arm-common-source-files)),
- $(call get-libcompiler-rt-arm-common-source-files))
-endef
-
define get-libcompiler-rt-arm64-source-files
$(call filter-libcompiler-rt-common-source-files,
$(libcompiler_rt_common_SRC_FILES) \