Fix libc++ build.
Change-Id: Ibd838a3b4205c41f49bb3758237fb6be0dd37bd4
diff --git a/sources/cxx-stl/llvm-libc++/Android.mk b/sources/cxx-stl/llvm-libc++/Android.mk
index 4128e31..783597d 100644
--- a/sources/cxx-stl/llvm-libc++/Android.mk
+++ b/sources/cxx-stl/llvm-libc++/Android.mk
@@ -136,13 +136,7 @@
llvm_libc++_sources += $(addprefix $(libcxxabi_sources_prefix:%/=%)/,$(libcxxabi_src_files))
llvm_libc++_includes += $(libcxxabi_c_includes)
llvm_libc++_export_includes += $(libcxxabi_c_includes)
-
-ifeq (clang3.5,$(NDK_TOOLCHAIN_VERSION))
-# Workaround an issue of integrated-as (default in clang3.5) where it fails to compile
-# llvm-libc++abi/libcxxabi/src/Unwind/UnwindRegistersRestore.S
-llvm_libc++_cflags += -no-integrated-as
-endif
-
+llvm_libc++_cflags += -D__STDC_FORMAT_MACROS
endif
ifneq ($(__libcxx_force_rebuild),true)
diff --git a/sources/cxx-stl/llvm-libc++abi/sources.mk b/sources/cxx-stl/llvm-libc++abi/sources.mk
index 0ecb69a..81f5dd9 100644
--- a/sources/cxx-stl/llvm-libc++abi/sources.mk
+++ b/sources/cxx-stl/llvm-libc++abi/sources.mk
@@ -21,7 +21,7 @@
libcxxabi/src/typeinfo.cpp \
libcxxabi/src/Unwind/libunwind.cpp \
libcxxabi/src/Unwind/Unwind-EHABI.cpp \
- libcxxabi/src/Unwind/Unwind-sjlj.cpp \
+ libcxxabi/src/Unwind/Unwind-sjlj.c \
libcxxabi/src/Unwind/UnwindLevel1.c \
libcxxabi/src/Unwind/UnwindLevel1-gcc-ext.c \
libcxxabi/src/Unwind/UnwindRegistersRestore.S \
