diff --git a/Android.mk b/Android.mk
index b803bdc..eb16d90 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,7 +64,7 @@
 LOCAL_C_INCLUDES := $(LIBCXX_C_INCLUDES) external/libcxxrt/include
 LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS) -DLIBCXXRT
 LOCAL_RTTI_FLAG := -frtti
-LOCAL_WHOLE_STATIC_LIBRARIES := libcxxrt
+LOCAL_WHOLE_STATIC_LIBRARIES := libcxxrt libcompiler_rt
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_STATIC_LIBRARY)
 
@@ -74,7 +74,7 @@
 LOCAL_CLANG := true
 LOCAL_WHOLE_STATIC_LIBRARIES := libc++
 LOCAL_SHARED_LIBRARIES := libdl
-LOCAL_SYSTEM_SHARED_LIBRARIES := libc
+LOCAL_SYSTEM_SHARED_LIBRARIES := libc libm
 
 # Bug: 14296739
 # The MIPS target in LLVM is spuriously generating a text relocation for