commit 770a3495607497071693147f162ac75f39423973
author Elliott Hughes <enh@google.com> Tue Oct 01 17:57:19 2013 -0700
committer Elliott Hughes <enh@google.com> Tue Oct 01 17:57:19 2013 -0700
tree 02446c2ee6b4351a2b2fe03bed5b8d74f99281ed
parent bcc2bd3b1e625243df41bdf212bdb3dd2ec3c26e

Fix libm build for x86_64.

Change-Id: If89da2d5c3d9a88f78ffd8b260ad0f2fd391c608

libm/Android.mk

diff --git a/libm/Android.mk b/libm/Android.mk
index 3e769e7..1d87dc2 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -217,7 +217,7 @@
 
 # TODO: re-enable i387/e_sqrtf.S for x86, and maybe others.
 
-libm_common_cflags := -DFLT_EVAL_METHOD=0
+libm_common_cflags := -DFLT_EVAL_METHOD=0 -std=c99
 libm_common_includes := $(LOCAL_PATH)/upstream-freebsd/lib/msun/src/
 
 libm_arm_includes := $(LOCAL_PATH)/arm
@@ -226,7 +226,7 @@
 libm_x86_includes := $(LOCAL_PATH)/i386 $(LOCAL_PATH)/i387
 libm_x86_src_files := i387/fenv.c
 
-libm_x86_64_includes := $(LOCAL_PATH)/amd64 $(LOCAL_PATH)/i387
+libm_x86_64_includes := $(LOCAL_PATH)/amd64
 libm_x86_64_src_files := amd64/fenv.c
 
 libm_mips_cflags := -fno-builtin-rintf -fno-builtin-rint