tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build/core/clang/TARGET_x86.mk

58 lines
2.1 KiB
Makefile
Raw Normal View History

Refactor llvm_config.mk and support the 2nd arch 1. Following the setup of gcc in build/core/combo/, we added the [HOST|TARGET]_<arch>.mk clang config files, and load only the configs needed by the current product. 2. Added support for the 2nd arch. Change-Id: I2a383418a9688a050b39492f8e489d40eeeb5f2d
2014-02-07 03:08:44 +01:00
include $(BUILD_SYSTEM)/clang/x86.mk
CLANG_CONFIG_x86_TARGET_TRIPLE := i686-linux-android
Fix incorrect x86 build rules. combo/TARGET_x86*.mk mistakenly added TARGET_GLOBAL_CFLAGS to their linker command lines. This results in clang builds not working properly, since they strip some unknown flags from TARGET_GLOBAL_CFLAGS. Change-Id: I60a1ff5df70305323134435e4ae107ea7acfe8ea
2014-02-13 12:21:12 +01:00
# NOTE: There is no i686-linux-android prebuilt, so we must hardcode the
# x86_64 target instead.
Refactor llvm_config.mk and support the 2nd arch 1. Following the setup of gcc in build/core/combo/, we added the [HOST|TARGET]_<arch>.mk clang config files, and load only the configs needed by the current product. 2. Added support for the 2nd arch. Change-Id: I2a383418a9688a050b39492f8e489d40eeeb5f2d
2014-02-07 03:08:44 +01:00
CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX := \
fix 2nd target clang prebuilt paths Change-Id: I4c196221bd377e30bbff1aafa265952e29c85cb5
2014-02-11 21:47:52 +01:00
$($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin
Refactor llvm_config.mk and support the 2nd arch 1. Following the setup of gcc in build/core/combo/, we added the [HOST|TARGET]_<arch>.mk clang config files, and load only the configs needed by the current product. 2. Added support for the 2nd arch. Change-Id: I2a383418a9688a050b39492f8e489d40eeeb5f2d
2014-02-07 03:08:44 +01:00
CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS := \
$(CLANG_CONFIG_EXTRA_ASFLAGS) \
$(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \
$(CLANG_CONFIG_x86_EXTRA_ASFLAGS) \
-target $(CLANG_CONFIG_x86_TARGET_TRIPLE) \
-B$(CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX)
CLANG_CONFIG_x86_TARGET_EXTRA_CFLAGS := \
$(CLANG_CONFIG_EXTRA_CFLAGS) \
$(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \
$(CLANG_CONFIG_x86_EXTRA_CFLAGS) \
$(CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS)
CLANG_CONFIG_x86_TARGET_EXTRA_CPPFLAGS := \
$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
$(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \
$(CLANG_CONFIG_x86_EXTRA_CPPFLAGS) \
CLANG_CONFIG_x86_TARGET_EXTRA_LDFLAGS := \
$(CLANG_CONFIG_EXTRA_LDFLAGS) \
$(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \
$(CLANG_CONFIG_x86_EXTRA_LDFLAGS) \
-target $(CLANG_CONFIG_x86_TARGET_TRIPLE) \
-B$(CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX)
define $(clang_2nd_arch_prefix)convert-to-clang-flags
$(strip \
$(call subst-clang-incompatible-x86-flags,\
$(filter-out $(CLANG_CONFIG_x86_UNKNOWN_CFLAGS),\
$(1))))
endef
$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CFLAGS := \
$(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS)) \
$(CLANG_CONFIG_x86_TARGET_EXTRA_CFLAGS)
$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_CPPFLAGS := \
$(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_CPPFLAGS)) \
$(CLANG_CONFIG_x86_TARGET_EXTRA_CPPFLAGS)
$(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \
$(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS)) \
$(CLANG_CONFIG_x86_TARGET_EXTRA_LDFLAGS)
Fix RS_TRIPLE and RS_TRIPLE_CFLAGS. Bug: 17333374 Add RS_TRIPLE_CFLAGS to ensure that we build with the proper defines on targets like x86. This also changes all build targets to use the proper 32/64-bit triples when creating their runtime libraries. Change-Id: I8f6175b1a14af6d03ee90f32069f3688ec227fb9
2014-08-29 23:43:53 +02:00
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__
Fix build breakage due to incorrect bcc_compat RS_TRIPLE. Bug: 17333374 Change-Id: I13582ce0cde86f7b3728aa4f45a5197438d65a2d (cherry picked from commit 52626d2a7b4767905e8a369ddc8316c1290ad156)
2014-09-03 04:09:35 +02:00
RS_COMPAT_TRIPLE := i686-linux-android
Reference in a new issue Copy permalink