Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56

6 files changed, 13 insertions, 8 deletions

diff --git a/libc/arch-arm/cortex-a53/cortex-a53.mk b/libc/arch-arm/cortex-a53/cortex-a53.mk
new file mode 100644
index 0000000..62c1276
--- /dev/null
+++ b/libc/arch-arm/cortex-a53/cortex-a53.mk
@@ -0,0 +1,4 @@
+$(call libc-add-cpu-variant-src,MEMMOVE,arch-arm/krait/bionic/memmove.S)
+$(call libc-add-cpu-variant-src,BCOPY,)
+
+include bionic/libc/arch-arm/cortex-a15/cortex-a15.mk
diff --git a/libm/Android.mk b/libm/Android.mk
index 85210bd..b6ccc4c 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -213,7 +213,7 @@ libm_common_src_files += fake_long_double.c
 
 # 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
 libm_common_includes := $(LOCAL_PATH)/upstream-freebsd/lib/msun/src/
 
 libm_arm_includes := $(LOCAL_PATH)/arm
@@ -225,7 +225,7 @@ ifeq ($(TARGET_CPU_VARIANT),krait)
 	arm/s_sin.S	\
 	arm/e_sqrtf.S	\
 	arm/e_sqrt.S
-  libm_arm_cflags += -DKRAIT_NEON_OPTIMIZATION -fno-if-conversion
+  libm_arm_cflags += -DQCOM_NEON_OPTIMIZATION -fno-if-conversion
 else
   ifeq ($(TARGET_USE_QCOM_BIONIC_OPTIMIZATION),true)
     libm_arm_src_files += \
@@ -234,16 +234,17 @@ else
       arm/s_sin.S \
       arm/e_sqrtf.S \
       arm/e_sqrt.S
-    libm_arm_cflags += -DKRAIT_NEON_OPTIMIZATION -fno-if-conversion
+    libm_arm_cflags += -DQCOM_NEON_OPTIMIZATION -fno-if-conversion
   else
     libm_common_src_files += \
       upstream-freebsd/lib/msun/src/s_cos.c \
       upstream-freebsd/lib/msun/src/s_sin.c \
       upstream-freebsd/lib/msun/src/e_sqrtf.c \
       upstream-freebsd/lib/msun/src/e_sqrt.c
-    endif
+  endif
 endif
 
+
 libm_x86_includes := $(LOCAL_PATH)/i386 $(LOCAL_PATH)/i387
 libm_x86_src_files := i387/fenv.c
 
diff --git a/libm/upstream-freebsd/lib/msun/src/e_pow.c b/libm/upstream-freebsd/lib/msun/src/e_pow.c
index 917e80b..d9f278f 100644
--- a/libm/upstream-freebsd/lib/msun/src/e_pow.c
+++ b/libm/upstream-freebsd/lib/msun/src/e_pow.c
@@ -94,7 +94,7 @@ ivln2_h  =  1.44269502162933349609e+00, /* 0x3FF71547, 0x60000000 =24b 1/ln2*/
 ivln2_l  =  1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/
 
 double
-#if defined(KRAIT_NEON_OPTIMIZATION) || defined(SPARROW_NEON_OPTIMIZATION)
+#if defined(KRAIT_NEON_OPTIMIZATION) || defined(QCOM_NEON_OPTIMIZATION)
 __full_ieee754_pow(double x, double y)
 #else
 __ieee754_pow(double x, double y)
diff --git a/libm/upstream-freebsd/lib/msun/src/k_cos.c b/libm/upstream-freebsd/lib/msun/src/k_cos.c
index a7eab7b..6037e0d 100644
--- a/libm/upstream-freebsd/lib/msun/src/k_cos.c
+++ b/libm/upstream-freebsd/lib/msun/src/k_cos.c
@@ -68,7 +68,7 @@ C6  = -1.13596475577881948265e-11; /* 0xBDA8FAE9, 0xBE8838D4 */
 double
 __kernel_cos(double x, double y)
 {
-#if defined(KRAIT_NEON_OPTIMIZATION)
+#if defined(KRAIT_NEON_OPTIMIZATION) || defined(QCOM_NEON_OPTIMIZATION)
 	double hz,z,zz,r,w,k;
 
 	z  = x*x;
diff --git a/libm/upstream-freebsd/lib/msun/src/k_sin.c b/libm/upstream-freebsd/lib/msun/src/k_sin.c
index 8506391..afd2da8 100644
--- a/libm/upstream-freebsd/lib/msun/src/k_sin.c
+++ b/libm/upstream-freebsd/lib/msun/src/k_sin.c
@@ -59,7 +59,7 @@ S6  =  1.58969099521155010221e-10; /* 0x3DE5D93A, 0x5ACFD57C */
 double
 __kernel_sin(double x, double y, int iy)
 {
-#if defined(KRAIT_NEON_OPTIMIZATION)
+#if defined(KRAIT_NEON_OPTIMIZATION) || defined(QCOM_NEON_OPTIMIZATION)
 	double z,zz,r,v;
 
 	z	=  x*x;
diff --git a/libm/upstream-freebsd/lib/msun/src/math_private.h b/libm/upstream-freebsd/lib/msun/src/math_private.h
index a079cc0..5821349 100644
--- a/libm/upstream-freebsd/lib/msun/src/math_private.h
+++ b/libm/upstream-freebsd/lib/msun/src/math_private.h
@@ -723,7 +723,7 @@ irintl(long double x)
 #define	__ieee754_remainderf remainderf
 #define	__ieee754_scalbf scalbf
 
-#if defined(KRAIT_NEON_OPTIMIZATION)
+#if defined(KRAIT_NEON_OPTIMIZATION) || defined(QCOM_NEON_OPTIMIZATION)
 int	__kernel_rem_pio2(double*,double*,int,int,int) __attribute__((pcs("aapcs-vfp")));
 double	__full_ieee754_pow(double,double);
 #ifndef INLINE_REM_PIO2