Merge "Remove issetugid."
diff --git a/libm/Android.mk b/libm/Android.mk
index 4dfb216..b67395f 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -241,6 +241,11 @@
-Wno-unknown-pragmas \
-fvisibility=hidden \
+# Workaround the GCC "(long)fn -> lfn" optimization bug which will result in
+# self recursions for lrint, lrintf, and lrintl.
+# BUG: 14225968
+libm_common_cflags += -fno-builtin-rint -fno-builtin-rintf -fno-builtin-rintl
+
libm_common_includes := $(LOCAL_PATH)/upstream-freebsd/lib/msun/src/
libm_ld_includes := $(LOCAL_PATH)/upstream-freebsd/lib/msun/ld128/
@@ -270,10 +275,8 @@
LOCAL_C_INCLUDES_x86_64 := $(libm_ld_includes)
LOCAL_SRC_FILES_x86_64 := amd64/fenv.c $(libm_ld_src_files)
-LOCAL_CFLAGS_mips := -fno-builtin-rintf -fno-builtin-rint
LOCAL_SRC_FILES_mips := mips/fenv.c
-LOCAL_CFLAGS_mips64 := -fno-builtin-rintf -fno-builtin-rint
LOCAL_C_INCLUDES_mips64 := $(libm_ld_includes)
LOCAL_SRC_FILES_mips64 := mips/fenv.c $(libm_ld_src_files)
diff --git a/tests/wchar_test.cpp b/tests/wchar_test.cpp
index 5fa5bf9..5a250a2 100644
--- a/tests/wchar_test.cpp
+++ b/tests/wchar_test.cpp
@@ -450,6 +450,6 @@
wmemmove(wstr, const_wstr, sizeof(const_wstr)/sizeof(wchar_t));
EXPECT_STREQ(const_wstr, wstr);
- wmemmove(wstr+5, wstr, sizeof(const_wstr)/sizeof(wchar_t) - 5);
- EXPECT_STREQ(L"This This is a test of something or other.", wstr);
+ wmemmove(wstr+5, wstr, sizeof(const_wstr)/sizeof(wchar_t) - 6);
+ EXPECT_STREQ(L"This This is a test of something or other", wstr);
}