Merge "Add 64-bit windows cross-compiles" (8c4f25f1) · Commits · e / os / android_build

core/base_rules.mk

+4 −4

Original line number	Diff line number	Diff line
		@@ -168,14 +168,14 @@ ifneq ($(strip $(LOCAL_BUILT_MODULE)$(LOCAL_INSTALLED_MODULE)),)
		endif

		my_register_name := $(LOCAL_MODULE)
		ifeq ($(my_host_cross),true)
		my_register_name := host_cross_$(LOCAL_MODULE)
		endif
		ifdef LOCAL_2ND_ARCH_VAR_PREFIX
		ifndef LOCAL_NO_2ND_ARCH_MODULE_SUFFIX
		my_register_name := $(LOCAL_MODULE)$($(my_prefix)2ND_ARCH_MODULE_SUFFIX)
		my_register_name := $(my_register_name)$($(my_prefix)2ND_ARCH_MODULE_SUFFIX)
		endif
		endif
		ifeq ($(my_host_cross),true)
		my_register_name := host_cross_$(LOCAL_MODULE)
		endif
		# Make sure that this IS_HOST/CLASS/MODULE combination is unique.
		module_id := MODULE.$(if \
		$(LOCAL_IS_HOST_MODULE),$($(my_prefix)OS),TARGET).$(LOCAL_MODULE_CLASS).$(my_register_name)

core/clang/HOST_CROSS_windows.mk→core/clang/HOST_CROSS_x86.mk

+9 −9

Original line number	Diff line number	Diff line
		@@ -37,20 +37,20 @@ CLANG_CONFIG_x86_HOST_CROSS_EXTRA_LDFLAGS := \
		$(CLANG_CONFIG_x86_HOST_CROSS_COMBO_EXTRA_LDFLAGS) \
		-target $(CLANG_CONFIG_x86_HOST_CROSS_TRIPLE)

		CLANG_HOST_CROSS_GLOBAL_CFLAGS := \
		$(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_CFLAGS)) \
		$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_CFLAGS := \
		$(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CFLAGS)) \
		$(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CFLAGS)

		CLANG_HOST_CROSS_GLOBAL_CONLYFLAGS := \
		$(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_CONLYFLAGS)) \
		$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_CONLYFLAGS := \
		$(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CONLYFLAGS)) \
		$(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CONLYFLAGS)

		CLANG_HOST_CROSS_GLOBAL_CPPFLAGS := \
		$(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_CPPFLAGS)) \
		$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_CPPFLAGS := \
		$(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CPPFLAGS)) \
		$(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_CPPFLAGS)

		CLANG_HOST_CROSS_GLOBAL_LDFLAGS := \
		$(call convert-to-host-clang-flags,$(HOST_CROSS_GLOBAL_LDFLAGS)) \
		$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_LDFLAGS := \
		$(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_LDFLAGS)) \
		$(CLANG_CONFIG_x86_HOST_CROSS_EXTRA_LDFLAGS)

		HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a
		$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a

core/clang/HOST_CROSS_x86_64.mk

0 → 100644

+56 −0

Original line number	Diff line number	Diff line

		include $(BUILD_SYSTEM)/clang/x86_64.mk

		CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE := x86_64-pc-mingw32

		CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_ASFLAGS := \
		$(CLANG_CONFIG_EXTRA_ASFLAGS) \
		$(CLANG_CONFIG_HOST_CROSS_EXTRA_ASFLAGS) \
		$(CLANG_CONFIG_x86_64_EXTRA_ASFLAGS) \
		$(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_ASFLAGS) \
		-target $(CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE)

		CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CFLAGS := \
		$(CLANG_CONFIG_EXTRA_CFLAGS) \
		$(CLANG_CONFIG_HOST_CROSS_EXTRA_CFLAGS) \
		$(CLANG_CONFIG_x86_64_EXTRA_CFLAGS) \
		$(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CFLAGS) \
		$(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_ASFLAGS)

		CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CONLYFLAGS := \
		$(CLANG_CONFIG_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_HOST_CROSS_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_x86_64_EXTRA_CONLYFLAGS) \
		$(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CONLYFLAGS)

		CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CPPFLAGS := \
		$(CLANG_CONFIG_EXTRA_CPPFLAGS) \
		$(CLANG_CONFIG_HOST_CROSS_EXTRA_CPPFLAGS) \
		$(CLANG_CONFIG_x86_64_EXTRA_CPPFLAGS) \
		$(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_CPPFLAGS) \
		-target $(CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE)

		CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_LDFLAGS := \
		$(CLANG_CONFIG_EXTRA_LDFLAGS) \
		$(CLANG_CONFIG_HOST_CROSS_EXTRA_LDFLAGS) \
		$(CLANG_CONFIG_x86_64_EXTRA_LDFLAGS) \
		$(CLANG_CONFIG_x86_64_HOST_CROSS_COMBO_EXTRA_LDFLAGS) \
		-target $(CLANG_CONFIG_x86_64_HOST_CROSS_TRIPLE)

		$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_CFLAGS := \
		$(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CFLAGS)) \
		$(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CFLAGS)

		$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_CONLYFLAGS := \
		$(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CONLYFLAGS)) \
		$(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CONLYFLAGS)

		$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_CPPFLAGS := \
		$(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_CPPFLAGS)) \
		$(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_CPPFLAGS)

		$(clang_2nd_arch_prefix)CLANG_HOST_CROSS_GLOBAL_LDFLAGS := \
		$(call convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_CROSS_GLOBAL_LDFLAGS)) \
		$(CLANG_CONFIG_x86_64_HOST_CROSS_EXTRA_LDFLAGS)

		$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a

core/clang/config.mk

+7 −2

Original line number	Diff line number	Diff line
		@@ -149,8 +149,13 @@ clang_2nd_arch_prefix := $(HOST_2ND_ARCH_VAR_PREFIX)
		include $(BUILD_SYSTEM)/clang/HOST_$(HOST_2ND_ARCH).mk
		endif

		ifdef HOST_CROSS_OS
		include $(BUILD_SYSTEM)/clang/HOST_CROSS_$(HOST_CROSS_OS).mk
		ifdef HOST_CROSS_ARCH
		clang_2nd_arch_prefix :=
		include $(BUILD_SYSTEM)/clang/HOST_CROSS_$(HOST_CROSS_ARCH).mk
		ifdef HOST_CROSS_2ND_ARCH
		clang_2nd_arch_prefix := $(HOST_CROSS_2ND_ARCH_VAR_PREFIX)
		include $(BUILD_SYSTEM)/clang/HOST_CROSS_$(HOST_CROSS_2ND_ARCH).mk
		endif
		endif

		# TARGET config

core/clear_vars.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -297,6 +297,9 @@ LOCAL_SRC_FILES_$(HOST_OS)_$(HOST_2ND_ARCH):=
		endif
		ifdef HOST_CROSS_OS
		LOCAL_SRC_FILES_$(HOST_CROSS_OS)_$(HOST_CROSS_ARCH):=
		ifdef HOST_CROSS_2ND_ARCH
		LOCAL_SRC_FILES_$(HOST_CROSS_OS)_$(HOST_CROSS_2ND_ARCH):=
		endif
		endif

		LOCAL_SRC_FILES_32:=