diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-22 09:21:53 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2014-10-22 09:21:53 -0700 |
| commit | 57c8a15edd5db9c50b8fc56f3ad355b5d58c04e6 (patch) | |
| tree | b23ebbc17397543d9d3de0567d5493fdf2db52cc /core/clang | |
| parent | 46ba24c4a00156d6149be78928de962bf52e9502 (diff) | |
| download | build-57c8a15edd5db9c50b8fc56f3ad355b5d58c04e6.zip build-57c8a15edd5db9c50b8fc56f3ad355b5d58c04e6.tar.gz build-57c8a15edd5db9c50b8fc56f3ad355b5d58c04e6.tar.bz2 | |
Set default to Clang integrated assembler.
BUG: 17820427
Change-Id: I10a6ddd94aad083665164d7939990e148b3b6efb
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/HOST_x86_common.mk | 18 | ||||
| -rw-r--r-- | core/clang/arm.mk | 12 | ||||
| -rw-r--r-- | core/clang/arm64.mk | 6 |
3 files changed, 12 insertions, 24 deletions
diff --git a/core/clang/HOST_x86_common.mk b/core/clang/HOST_x86_common.mk index 92058e1..74b5a69 100644 --- a/core/clang/HOST_x86_common.mk +++ b/core/clang/HOST_x86_common.mk @@ -11,12 +11,10 @@ endif ifeq ($(HOST_OS),linux) CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \ --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \ - --sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \ - -no-integrated-as + --sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \ - --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \ - -no-integrated-as + --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) ifneq ($(strip $($(clang_2nd_arch_prefix)HOST_IS_64_BIT)),) 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 \ -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/backward \ - -no-integrated-as + -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \ --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)/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/ \ - -no-integrated-as + -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64/ else CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \ --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \ --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/x86_64-linux/32 \ - -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward \ - -no-integrated-as + -isystem $($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.8/backward CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \ --gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \ @@ -50,8 +45,7 @@ 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)/lib/gcc/x86_64-linux/4.8/32 \ -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.8/32 \ - -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32/ \ - -no-integrated-as + -L$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32/ endif endif # Linux diff --git a/core/clang/arm.mk b/core/clang/arm.mk index f979409..ca66986 100644 --- a/core/clang/arm.mk +++ b/core/clang/arm.mk @@ -1,16 +1,12 @@ # Clang flags for arm arch, target or host. -CLANG_CONFIG_arm_EXTRA_ASFLAGS := \ - -no-integrated-as +CLANG_CONFIG_arm_EXTRA_ASFLAGS := -CLANG_CONFIG_arm_EXTRA_CFLAGS := \ - -no-integrated-as +CLANG_CONFIG_arm_EXTRA_CFLAGS := -CLANG_CONFIG_arm_EXTRA_CPPFLAGS := \ - -no-integrated-as +CLANG_CONFIG_arm_EXTRA_CPPFLAGS := -CLANG_CONFIG_arm_EXTRA_LDFLAGS := \ - -no-integrated-as +CLANG_CONFIG_arm_EXTRA_LDFLAGS := # Include common unknown flags CLANG_CONFIG_arm_UNKNOWN_CFLAGS := \ diff --git a/core/clang/arm64.mk b/core/clang/arm64.mk index 9fb3670..ab395b3 100644 --- a/core/clang/arm64.mk +++ b/core/clang/arm64.mk @@ -1,10 +1,8 @@ # Clang flags for arm64 arch, target or host. -CLANG_CONFIG_arm64_EXTRA_ASFLAGS := \ - -no-integrated-as +CLANG_CONFIG_arm64_EXTRA_ASFLAGS := -CLANG_CONFIG_arm64_EXTRA_CFLAGS := \ - -no-integrated-as +CLANG_CONFIG_arm64_EXTRA_CFLAGS := CLANG_CONFIG_arm64_EXTRA_LDFLAGS := |