commit fb0a6f7ac58cfd1f4d7b0b26f0ba1e79b870eb1d
author Elliott Hughes <enh@google.com> Tue Jul 23 13:03:51 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 23 13:03:51 2024 +0000
tree c061f37799873474377ce740e1a107d2e848f910
parent 60119cbf15d17f235adf008966769e419ddbf5c7
parent 3f0c9e826fd9c8f44cd7b33473d1e451dae2d4d2

Merge "Don't manually -DFLT_EVAL_METHOD." into main

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);           \