Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix x86 build (problems spotted by StrictMath tests).

Bug: 2931959
Change-Id: I6e080922e20452b60957242e618f3ad84e1fb038
  • Loading branch information...
commit 6a0e513d7d40e34caeb85fe55d21609946448915 1 parent 26ea429
@enh enh authored
Showing with 8 additions and 0 deletions.
  1. +6 −0 Android.mk
  2. +2 −0  CleanSpec.mk
View
6 Android.mk
@@ -45,6 +45,12 @@ src_files := \
# are used.
cflags := "-D_LIB_VERSION_TYPE=\"const enum _IEEE_\""
+# Disable GCC optimizations that interact badly with this crufty
+# library (see their own admission in 'readme'). Without this, we
+# fail StrictMath tests on x86.
+cflags += "-fno-strict-aliasing"
+cflags += "-ffloat-store"
+
#
# Build for the target (device).
View
2  CleanSpec.mk
@@ -47,3 +47,5 @@
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/linux-x86/obj/STATIC_LIBRARIES/libfdlibm-host_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libfdlibm_intermediates)
Please sign in to comment.
Something went wrong with that request. Please try again.