Stop passing integrated assembler options.

Test: ./checkbuild.py && ./run_tests.py
Bug: android/ndk#614
Change-Id: I1ae3d7ab1a9792a0bff91bd2800d2aee1105006d
(cherry picked from commit fb5456cf0b84af7b2caff90fc0cbe1fed1904b80)

CHANGELOG.md

@@ -72,9 +72,13 @@ NDK
    your app if you have not specified your own wrap.sh. If you have specified
    your own wrap.sh, you can add ASAN support to it as described
    [here](https://github.com/google/sanitizers/wiki/AddressSanitizerOnAndroidO).
+ * [Issue 614]: ndk-build and CMake no longer pass `-fno-integrated-as` for
+   arm32 by default.  If your project contains hand written assembly, you may
+   need to pass this flag.
 
 [wrap.sh]: https://developer.android.com/ndk/guides/wrap-script.html
 [Issue 540]: https://github.com/android-ndk/ndk/issues/540
+[Issue 614]: https://github.com/android-ndk/ndk/issues/614
 
 [Issue 313]: https://github.com/android-ndk/ndk/issues/313
 

build/cmake/android.toolchain.cmake

@@ -530,14 +530,6 @@ if(ANDROID_ABI STREQUAL mips)
   list(APPEND ANDROID_COMPILER_FLAGS
     -mips32)
 endif()
-if(ANDROID_ABI STREQUAL "mips64" AND ANDROID_TOOLCHAIN STREQUAL clang)
-  list(APPEND ANDROID_COMPILER_FLAGS "-fintegrated-as")
-endif()
-if(ANDROID_ABI MATCHES "^armeabi" AND ANDROID_TOOLCHAIN STREQUAL clang)
-  # Disable integrated-as for better compatibility.
-  list(APPEND ANDROID_COMPILER_FLAGS
-    -fno-integrated-as)
-endif()
 if(ANDROID_ABI STREQUAL mips AND ANDROID_TOOLCHAIN STREQUAL clang)
   # Help clang use mips64el multilib GCC
   list(APPEND ANDROID_LINKER_FLAGS

build/core/toolchains/arm-linux-androideabi-clang/setup.mk

@@ -49,9 +49,6 @@ TARGET_CFLAGS := \
     -Wno-unused-command-line-argument \
     -no-canonical-prefixes
 
-# Disable integrated-as for better compatibility
-TARGET_CFLAGS += -fno-integrated-as
-
 # Always enable debug info. We strip binaries when needed.
 TARGET_CFLAGS += -g
 

build/tools/builder-funcs.sh

@@ -591,10 +591,6 @@ builder_begin_android ()
         esac
         SCRATCH_FLAGS="-target $LLVM_TRIPLE $FLAGS"
         builder_ldflags "$SCRATCH_FLAGS"
-        if [ "$ABI" == "mips64" ]; then
-            # https://github.com/android-ndk/ndk/issues/399
-            SCRATCH_FLAGS="$SCRATCH_FLAGS -fintegrated-as"
-        fi
         builder_cflags  "$SCRATCH_FLAGS"
         builder_cxxflags "$SCRATCH_FLAGS"
         if [ ! -z $GCC_TOOLCHAIN ]; then

tests/build/ssax-instructions/jni/Android.mk

@@ -4,4 +4,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := ssax_instruction
 LOCAL_ARM_NEON := true
 LOCAL_SRC_FILES := test.S
+ifneq ($(filter clang%,$(NDK_TOOLCHAIN_VERSION)),)
+    # asm is not compatible with Clang's assembler.
+    LOCAL_ASFLAGS := -fno-integrated-as
+endif
 include $(BUILD_SHARED_LIBRARY)