Merge "Fix x86 config file to support 2nd ARCH build" (5aa50c66) · Commits · e / os / android_build

core/combo/TARGET_linux-x86.mk

+59 −59

Original line number	Diff line number	Diff line
		@@ -18,56 +18,56 @@
		# Included by combo/select.mk

		# Provide a default variant.
		ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
		TARGET_ARCH_VARIANT := x86
		ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),)
		TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := x86
		endif

		ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
		TARGET_GCC_VERSION := 4.8
		$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8
		else
		TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
		$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
		endif

		# Include the arch-variant-specific configuration file.
		# Its role is to define various ARCH_X86_HAVE_XXX feature macros,
		# plus initial values for TARGET_GLOBAL_CFLAGS
		#
		TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk
		TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT).mk
		ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
		$(error Unknown $(TARGET_ARCH) architecture version: $(TARGET_ARCH_VARIANT))
		$(error Unknown $(TARGET_$(combo_2nd_arch_prefix)ARCH) architecture version: $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT))
		endif

		include $(TARGET_ARCH_SPECIFIC_MAKEFILE)


		# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
		ifeq ($(strip $(TARGET_TOOLS_PREFIX)),)
		TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$(TARGET_GCC_VERSION)
		TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/x86_64-linux-android-
		ifeq ($(strip $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)),)
		$(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/x86/x86_64-linux-android-$($(combo_2nd_arch_prefix)TARGET_GCC_VERSION)
		$(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX := $($(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/bin/x86_64-linux-android-
		endif

		TARGET_CC := $(TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)
		TARGET_CXX := $(TARGET_TOOLS_PREFIX)g++$(HOST_EXECUTABLE_SUFFIX)
		TARGET_AR := $(TARGET_TOOLS_PREFIX)ar$(HOST_EXECUTABLE_SUFFIX)
		TARGET_OBJCOPY := $(TARGET_TOOLS_PREFIX)objcopy$(HOST_EXECUTABLE_SUFFIX)
		TARGET_LD := $(TARGET_TOOLS_PREFIX)ld$(HOST_EXECUTABLE_SUFFIX)
		TARGET_STRIP := $(TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX)
		$(combo_2nd_arch_prefix)TARGET_CC := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)gcc$(HOST_EXECUTABLE_SUFFIX)
		$(combo_2nd_arch_prefix)TARGET_CXX := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)g++$(HOST_EXECUTABLE_SUFFIX)
		$(combo_2nd_arch_prefix)TARGET_AR := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)ar$(HOST_EXECUTABLE_SUFFIX)
		$(combo_2nd_arch_prefix)TARGET_OBJCOPY := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)objcopy$(HOST_EXECUTABLE_SUFFIX)
		$(combo_2nd_arch_prefix)TARGET_LD := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)ld$(HOST_EXECUTABLE_SUFFIX)
		$(combo_2nd_arch_prefix)TARGET_STRIP := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX)

		ifeq ($(TARGET_BUILD_VARIANT),user)
		TARGET_STRIP_COMMAND = $(PRIVATE_STRIP) --strip-debug $< -o $@
		$(combo_2nd_arch_prefix)TARGET_STRIP_COMMAND = $(PRIVATE_STRIP) --strip-debug $< -o $@
		else
		TARGET_STRIP_COMMAND = $(PRIVATE_STRIP) --strip-debug $< -o $@ && \
		$(combo_2nd_arch_prefix)TARGET_STRIP_COMMAND = $(PRIVATE_STRIP) --strip-debug $< -o $@ && \
		$(PRIVATE_OBJCOPY) --add-gnu-debuglink=$< $@
		endif

		ifneq ($(wildcard $(TARGET_CC)),)
		TARGET_LIBGCC := \
		$(shell $(TARGET_CC) -m32 -print-file-name=libgcc.a)
		target_libgcov := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \
		ifneq ($(wildcard $($(combo_2nd_arch_prefix)TARGET_CC)),)
		$(combo_2nd_arch_prefix)TARGET_LIBGCC := \
		$(shell $($(combo_2nd_arch_prefix)TARGET_CC) -m32 -print-file-name=libgcc.a)
		target_libgcov := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) \
		-print-file-name=libgcov.a)
		endif

		TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined
		$(combo_2nd_arch_prefix)TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined

		libc_root := bionic/libc
		libm_root := bionic/libm
		@@ -75,29 +75,29 @@ libstdc++_root := bionic/libstdc++

		# Define FDO (Feedback Directed Optimization) options.

		TARGET_FDO_CFLAGS:=
		TARGET_FDO_LIB:=
		$(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS:=
		$(combo_2nd_arch_prefix)TARGET_FDO_LIB:=

		ifneq ($(strip $(BUILD_FDO_INSTRUMENT)),)
		# Set BUILD_FDO_INSTRUMENT=true to turn on FDO instrumentation.
		# The profile will be generated on /data/local/tmp/profile on the device.
		TARGET_FDO_CFLAGS := -fprofile-generate=/data/local/tmp/profile -DANDROID_FDO
		TARGET_FDO_LIB := $(target_libgcov)
		$(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS := -fprofile-generate=/data/local/tmp/profile -DANDROID_FDO
		$(combo_2nd_arch_prefix)TARGET_FDO_LIB := $(target_libgcov)
		else
		# If BUILD_FDO_INSTRUMENT is turned off, then consider doing the FDO optimizations.
		# Set TARGET_FDO_PROFILE_PATH to set a custom profile directory for your build.
		ifeq ($(strip $(TARGET_FDO_PROFILE_PATH)),)
		TARGET_FDO_PROFILE_PATH := fdo/profiles/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT)
		ifeq ($(strip $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH)),)
		$(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH := fdo/profiles/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)
		else
		ifeq ($(strip $(wildcard $(TARGET_FDO_PROFILE_PATH))),)
		$(warning Custom TARGET_FDO_PROFILE_PATH supplied, but directory does not exist. Turn off FDO.)
		ifeq ($(strip $(wildcard $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH))),)
		$(warning Custom $(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH supplied, but directory does not exist. Turn off FDO.)
		endif
		endif

		# If the FDO profile directory can't be found, then FDO is off.
		ifneq ($(strip $(wildcard $(TARGET_FDO_PROFILE_PATH))),)
		TARGET_FDO_CFLAGS := -fprofile-use=$(TARGET_FDO_PROFILE_PATH) -DANDROID_FDO
		TARGET_FDO_LIB := $(target_libgcov)
		ifneq ($(strip $(wildcard $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH))),)
		$(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS := -fprofile-use=$($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH) -DANDROID_FDO
		$(combo_2nd_arch_prefix)TARGET_FDO_LIB := $(target_libgcov)
		endif
		endif

		@@ -107,7 +107,7 @@ KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

		android_config_h := $(call select-android-config-h,target_linux-x86)

		TARGET_GLOBAL_CFLAGS += \
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
		-O2 \
		-Ulinux \
		-Wa,--noexecstack \
		@@ -129,36 +129,36 @@ TARGET_GLOBAL_CFLAGS += \
		-include $(android_config_h) \
		-I $(dir $(android_config_h))

		TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags)
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags)

		ifeq ($(ARCH_X86_HAVE_SSSE3),true) # yes, really SSSE3, not SSE3!
		TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3
		endif
		ifeq ($(ARCH_X86_HAVE_SSE4),true)
		TARGET_GLOBAL_CFLAGS += -msse4
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -msse4
		endif
		ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
		TARGET_GLOBAL_CFLAGS += -msse4.1
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -msse4.1
		endif
		ifeq ($(ARCH_X86_HAVE_SSE4_2),true)
		TARGET_GLOBAL_CFLAGS += -msse4.2
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -msse4.2
		endif
		ifeq ($(ARCH_X86_HAVE_AVX),true)
		TARGET_GLOBAL_CFLAGS += -mavx
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -mavx
		endif
		ifeq ($(ARCH_X86_HAVE_AES_NI),true)
		TARGET_GLOBAL_CFLAGS += -maes
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -maes
		endif

		TARGET_GLOBAL_LDFLAGS += -m32
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -m32

		TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack
		TARGET_GLOBAL_LDFLAGS += -Wl,-z,relro -Wl,-z,now
		TARGET_GLOBAL_LDFLAGS += -Wl,--warn-shared-textrel
		TARGET_GLOBAL_LDFLAGS += -Wl,--fatal-warnings
		TARGET_GLOBAL_LDFLAGS += -Wl,--gc-sections
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,-z,relro -Wl,-z,now
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,--warn-shared-textrel
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,--fatal-warnings
		$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,--gc-sections

		TARGET_C_INCLUDES := \
		$(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \
		$(libc_root)/arch-x86/include \
		$(libc_root)/include \
		$(libstdc++_root)/include \
		@@ -166,19 +166,19 @@ TARGET_C_INCLUDES := \
		$(libm_root)/include \
		$(libm_root)/include/i387 \

		TARGET_CRTBEGIN_STATIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
		TARGET_CRTBEGIN_DYNAMIC_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
		TARGET_CRTEND_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o
		$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_STATIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_static.o
		$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_DYNAMIC_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_dynamic.o
		$(combo_2nd_arch_prefix)TARGET_CRTEND_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_android.o

		TARGET_CRTBEGIN_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
		TARGET_CRTEND_SO_O := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o
		$(combo_2nd_arch_prefix)TARGET_CRTBEGIN_SO_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtbegin_so.o
		$(combo_2nd_arch_prefix)TARGET_CRTEND_SO_O := $($(combo_2nd_arch_prefix)TARGET_OUT_INTERMEDIATE_LIBRARIES)/crtend_so.o

		TARGET_STRIP_MODULE:=true
		$(combo_2nd_arch_prefix)TARGET_STRIP_MODULE:=true

		TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm
		$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm

		TARGET_CUSTOM_LD_COMMAND := true
		define transform-o-to-shared-lib-inner
		$(combo_2nd_arch_prefix)TARGET_CUSTOM_LD_COMMAND := true
		define $(combo_2nd_arch_prefix)transform-o-to-shared-lib-inner
		$(hide) $(PRIVATE_CXX) \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		-nostdlib -Wl,-soname,$(notdir $@) \
		@@ -201,7 +201,7 @@ $(hide) $(PRIVATE_CXX) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))
		endef

		define transform-o-to-executable-inner
		define $(combo_2nd_arch_prefix)transform-o-to-executable-inner
		$(hide) $(PRIVATE_CXX) \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		-nostdlib -Bdynamic \
		@@ -226,7 +226,7 @@ $(hide) $(PRIVATE_CXX) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))
		endef

		define transform-o-to-static-executable-inner
		define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner
		$(hide) $(PRIVATE_CXX) \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		-nostdlib -Bstatic \