Merge "Set default to Clang integrated assembler." (660f3c9a) · Commits · e / os / android_build

core/clang/HOST_x86_common.mk

+6 −12

core/clang/arm.mk

+4 −8

Original line number	Original line	Diff line number	Diff line
	# Clang flags for arm arch, target or host.		# Clang flags for arm arch, target or host.

	CLANG_CONFIG_arm_EXTRA_ASFLAGS := \		CLANG_CONFIG_arm_EXTRA_ASFLAGS :=
	-no-integrated-as

	CLANG_CONFIG_arm_EXTRA_CFLAGS := \		CLANG_CONFIG_arm_EXTRA_CFLAGS :=
	-no-integrated-as

	CLANG_CONFIG_arm_EXTRA_CPPFLAGS := \		CLANG_CONFIG_arm_EXTRA_CPPFLAGS :=
	-no-integrated-as

	CLANG_CONFIG_arm_EXTRA_LDFLAGS := \		CLANG_CONFIG_arm_EXTRA_LDFLAGS :=
	-no-integrated-as

	# Include common unknown flags		# Include common unknown flags
	CLANG_CONFIG_arm_UNKNOWN_CFLAGS := \		CLANG_CONFIG_arm_UNKNOWN_CFLAGS := \

core/clang/arm64.mk

+2 −4

Original line number	Original line	Diff line number	Diff line
	# Clang flags for arm64 arch, target or host.		# Clang flags for arm64 arch, target or host.

	CLANG_CONFIG_arm64_EXTRA_ASFLAGS := \		CLANG_CONFIG_arm64_EXTRA_ASFLAGS :=
	-no-integrated-as

	CLANG_CONFIG_arm64_EXTRA_CFLAGS := \		CLANG_CONFIG_arm64_EXTRA_CFLAGS :=
	-no-integrated-as

	CLANG_CONFIG_arm64_EXTRA_LDFLAGS :=		CLANG_CONFIG_arm64_EXTRA_LDFLAGS :=

Original line number	Original line	Diff line number	Diff line
	@@ -11,12 +11,10 @@ endif
	ifeq ($(HOST_OS),linux)		ifeq ($(HOST_OS),linux)
	CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \
	--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
	--sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \		--sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot
	-no-integrated-as

	CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \
	--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)
	-no-integrated-as

	ifneq ($(strip $($(clang_2nd_arch_prefix)HOST_IS_64_BIT)),)		ifneq ($(strip $($(clang_2nd_arch_prefix)HOST_IS_64_BIT)),)
	CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
	@@ -24,8 +22,7 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
	--sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \		--sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
	-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8 \		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8 \
	-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/x86_64-linux \		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/x86_64-linux \
	-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward \		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward
	-no-integrated-as

	CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
	--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
	@@ -33,16 +30,14 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
	-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \		-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \
	-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8 \		-B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8 \
	-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8 \		-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8 \
	-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64/ \		-L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64/
	-no-integrated-as
	else		else
	CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
	--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
	--sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \		--sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
	-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8 \		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8 \
	-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/x86_64-linux/32 \		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/x86_64-linux/32 \
	-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward \		-isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward
	-no-integrated-as

	CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
	--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
	@@ -50,8 +45,7 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \