commit 3b583f633027955f84092dec0c1fec069f6c3757
author Elliott Hughes <enh@google.com> Thu Nov 09 17:47:49 2017 +0000
committer Elliott Hughes <enh@google.com> Thu Nov 09 17:47:49 2017 +0000
tree 819438bbceeafc028bf824c19355564d2825fd27
parent e57d7723539df4be246dfccb898050fb75683da2

Revert "Use builtins for fma/fmax/fmin/round on arm/arm64."

Apparently we still build non-NEON variants of bionic!

This reverts commit e57d7723539df4be246dfccb898050fb75683da2.

Change-Id: I5436d913b1dc9b7d8f5e6afaea9b45002be7e825

libm/Android.bp

diff --git a/libm/Android.bp b/libm/Android.bp
index a4bdbb8..da9c9a8 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -211,7 +211,7 @@
         "fake_long_double.c",
 
         // Home-grown stuff.
-        "builtins.cpp",
+        "fabs.cpp",
         "signbit.cpp",
     ],
 
@@ -291,14 +291,6 @@
                     "upstream-freebsd/lib/msun/src/e_sqrt.c",
                     "upstream-freebsd/lib/msun/src/e_sqrtf.c",
                     "upstream-freebsd/lib/msun/src/s_floor.c",
-                    "upstream-freebsd/lib/msun/src/s_fma.c",
-                    "upstream-freebsd/lib/msun/src/s_fmaf.c",
-                    "upstream-freebsd/lib/msun/src/s_fmax.c",
-                    "upstream-freebsd/lib/msun/src/s_fmaxf.c",
-                    "upstream-freebsd/lib/msun/src/s_fmin.c",
-                    "upstream-freebsd/lib/msun/src/s_fminf.c",
-                    "upstream-freebsd/lib/msun/src/s_round.c",
-                    "upstream-freebsd/lib/msun/src/s_roundf.c",
                 ],
             },
             instruction_set: "arm",
@@ -310,6 +302,7 @@
             srcs: [
                 "arm64/ceil.S",
                 "arm64/fenv.c",
+                "arm64/fma.S",
                 "arm64/floor.S",
                 "arm64/lrint.S",
                 "arm64/rint.S",
@@ -321,22 +314,16 @@
                 "upstream-freebsd/lib/msun/src/e_sqrtf.c",
                 "upstream-freebsd/lib/msun/src/s_ceil.c",
                 "upstream-freebsd/lib/msun/src/s_ceilf.c",
-                "upstream-freebsd/lib/msun/src/s_floor.c",
-                "upstream-freebsd/lib/msun/src/s_floorf.c",
                 "upstream-freebsd/lib/msun/src/s_fma.c",
                 "upstream-freebsd/lib/msun/src/s_fmaf.c",
-                "upstream-freebsd/lib/msun/src/s_fmax.c",
-                "upstream-freebsd/lib/msun/src/s_fmaxf.c",
-                "upstream-freebsd/lib/msun/src/s_fmin.c",
-                "upstream-freebsd/lib/msun/src/s_fminf.c",
+                "upstream-freebsd/lib/msun/src/s_floor.c",
+                "upstream-freebsd/lib/msun/src/s_floorf.c",
                 "upstream-freebsd/lib/msun/src/s_llrint.c",
                 "upstream-freebsd/lib/msun/src/s_llrintf.c",
                 "upstream-freebsd/lib/msun/src/s_lrint.c",
                 "upstream-freebsd/lib/msun/src/s_lrintf.c",
                 "upstream-freebsd/lib/msun/src/s_rint.c",
                 "upstream-freebsd/lib/msun/src/s_rintf.c",
-                "upstream-freebsd/lib/msun/src/s_round.c",
-                "upstream-freebsd/lib/msun/src/s_roundf.c",
                 "upstream-freebsd/lib/msun/src/s_trunc.c",
                 "upstream-freebsd/lib/msun/src/s_truncf.c",
             ],