commit 3f0c9e826fd9c8f44cd7b33473d1e451dae2d4d2
author Elliott Hughes <enh@google.com> Mon Jul 22 22:26:38 2024 +0000
committer Elliott Hughes <enh@google.com> Mon Jul 22 22:28:45 2024 +0000
tree 01683bf47f69ccfa147666faebae74a55c665153
parent 4ec3e70e4df2a89cf8f6e446cfbef6e781b311fb

Don't manually -DFLT_EVAL_METHOD.

FLT_EVAL_METHOD comes from <float.h> and is how the compiler communicates with us, not the other way around.

Also, the FreeBSD source #includes <float.h> in all the files that actually need the STRICT_ASSIGN() macro that uses FLT_EVAL_METHOD, so we don't need the forced include now (if we ever did).

Change-Id: I12d2867c6ca382f2849c8fa0adb5078f95792fbf

libm/Android.bp

diff --git a/libm/Android.bp b/libm/Android.bp
index fa43a16..6a51df7 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -389,7 +389,6 @@
 
     cflags: [
         "-D_BSD_SOURCE",
-        "-DFLT_EVAL_METHOD=0",
         "-include freebsd-compat.h",
         "-include fenv-access.h",
         "-fno-builtin",

libm/freebsd-compat.h

diff --git a/libm/freebsd-compat.h b/libm/freebsd-compat.h
index a3c7cd4..f1985d2 100644
--- a/libm/freebsd-compat.h
+++ b/libm/freebsd-compat.h
@@ -18,7 +18,6 @@
 
 // Some FreeBSD source includes <complex.h> and assumes <math.h> from that.
 #include <math.h>
-#include <float.h>
 
 #define __weak_reference(sym,alias)     \
     __asm__(".weak " #alias);           \