Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 660f3c9a authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Set default to Clang integrated assembler."

parents 46ba24c4 57c8a15e

core/clang/HOST_x86_common.mk

+6 −12
Original line number Diff line number Diff line
@@ -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

core/clang/arm.mk

+4 −8
Original line number Diff line number Diff line 
# 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 := \

core/clang/arm64.mk

+2 −4
Original line number Diff line number Diff line 
# 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 :=