Merge "Remove the libm-global `#pragma STDC FENV_ACCESS ON` hammer." into main
diff --git a/libc/Android.bp b/libc/Android.bp
index 7788a48..79b85c5 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2226,7 +2226,7 @@
nocrt: true,
stl: "none",
visibility: [
- "//packages/modules/Virtualization/vmbase",
+ "//packages/modules/Virtualization/libs/libvmbase",
],
}
diff --git a/libm/Android.bp b/libm/Android.bp
index 9adf9f1..de2e774 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",
"-fno-builtin",
"-fno-math-errno",
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); \
diff --git a/tests/float_test.cpp b/tests/float_test.cpp
index 3ef4593..a2b7ecb 100644
--- a/tests/float_test.cpp
+++ b/tests/float_test.cpp
@@ -122,3 +122,7 @@
#error LDBL_HAS_SUBNORM
#endif
}
+
+TEST(float_h, FLT_EVAL_METHOD_exact) {
+ ASSERT_EQ(0, FLT_EVAL_METHOD);
+}