Merge "x86_64: Adding new target" (5d92a933) · Commits · e / os / android_build

core/combo/TARGET_linux-x86.mk

100644 → 100755

+0 −4

Original line number	Diff line number	Diff line
		@@ -188,10 +188,6 @@ TARGET_GLOBAL_CFLAGS += -mbionic
		#
		TARGET_GLOBAL_CFLAGS += -D__ANDROID__

		# XXX: This flag is probably redundant since our toolchain binaries already
		# generate 32-bit machine code. It probably dates back to the old days
		# where we were using the host toolchain on Linux to build the platform
		# images. Consider it for removal.
		TARGET_GLOBAL_LDFLAGS += -m32

		TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack

core/combo/TARGET_linux-x86_64.mk

0 → 100755

+282 −0

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2006 The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		# You may obtain a copy of the License at
		#
		# http://www.apache.org/licenses/LICENSE-2.0
		#
		# Unless required by applicable law or agreed to in writing, software
		# distributed under the License is distributed on an "AS IS" BASIS,
		# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		# See the License for the specific language governing permissions and
		# limitations under the License.
		#

		# Configuration for Linux on x86_64 as a target.
		# Included by combo/select.mk

		# Provide a default variant.
		ifeq ($(strip $(TARGET_ARCH_VARIANT)),)
		TARGET_ARCH_VARIANT := x86_64
		endif

		ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
		TARGET_GCC_VERSION := 4.7
		else
		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
		ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
		$(error Unknown $(TARGET_ARCH) architecture version: $(TARGET_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-
		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)

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

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

		TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined

		libc_root := bionic/libc
		libm_root := bionic/libm
		libstdc++_root := bionic/libstdc++
		libthread_db_root := bionic/libthread_db

		# Define FDO (Feedback Directed Optimization) options.

		TARGET_FDO_CFLAGS:=
		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)
		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)
		else
		ifeq ($(strip $(wildcard $(TARGET_FDO_PROFILE_PATH))),)
		$(warning Custom 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)
		endif
		endif

		# unless CUSTOM_KERNEL_HEADERS is defined, we're going to use
		# symlinks located in out/ to point to the appropriate kernel
		# headers. see 'config/kernel_headers.make' for more details
		#
		ifneq ($(CUSTOM_KERNEL_HEADERS),)
		KERNEL_HEADERS_COMMON := $(CUSTOM_KERNEL_HEADERS)
		KERNEL_HEADERS_ARCH := $(CUSTOM_KERNEL_HEADERS)
		else
		KERNEL_HEADERS_COMMON := $(libc_root)/kernel/common
		KERNEL_HEADERS_ARCH := $(libc_root)/kernel/arch-$(TARGET_ARCH)
		endif
		KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)

		TARGET_GLOBAL_CFLAGS += \
		-O2 \
		-Ulinux \
		-Wa,--noexecstack \
		-Werror=format-security \
		-D_FORTIFY_SOURCE=2 \
		-Wstrict-aliasing=2 \
		-fPIC -fPIE \
		-ffunction-sections \
		-finline-functions \
		-finline-limit=300 \
		-fno-inline-functions-called-once \
		-fno-short-enums \
		-fstrict-aliasing \
		-funswitch-loops \
		-funwind-tables \
		-fstack-protector \
		-m64

		android_config_h := $(call select-android-config-h,target_linux-x86)
		TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))
		TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)

		# XXX: Not sure this is still needed. Must check with our toolchains.
		TARGET_GLOBAL_CPPFLAGS += \
		-fno-use-cxa-atexit

		TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags) \
		-mstackrealign \
		-mfpmath=sse

		ARCH_X86_HAVE_MMX := true
		ARCH_X86_HAVE_SSE := true
		ARCH_X86_HAVE_SSE2 := true
		ARCH_X86_HAVE_SSE3 := true

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

		# XXX: This flag is probably redundant. I believe our toolchain always sets
		# it by default. Consider for removal.
		#
		TARGET_GLOBAL_CFLAGS += -mbionic

		# XXX: This flag is probably redundant. The macro should be defined by our
		# toolchain binaries automatically (as a compiler built-in).
		# Check with: $BINPREFIX-gcc -dM -E < /dev/null
		#
		# Consider for removal.
		#
		TARGET_GLOBAL_CFLAGS += -D__ANDROID__

		TARGET_GLOBAL_LDFLAGS += -m64

		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,--gc-sections

		TARGET_C_INCLUDES := \
		$(libc_root)/arch-x86_64/include \
		$(libc_root)/include \
		$(libstdc++_root)/include \
		$(KERNEL_HEADERS) \
		$(libm_root)/include \
		$(libm_root)/include/amd64 \
		$(libthread_db_root)/include

		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

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

		TARGET_STRIP_MODULE:=true

		TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm

		TARGET_CUSTOM_LD_COMMAND := true
		define transform-o-to-shared-lib-inner
		$(hide) $(PRIVATE_CXX) \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		-nostdlib -Wl,-soname,$(notdir $@) \
		-shared -Bsymbolic \
		$(TARGET_GLOBAL_CFLAGS) \
		$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \
		$(PRIVATE_ALL_OBJECTS) \
		-Wl,--whole-archive \
		$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
		-Wl,--no-whole-archive \
		$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
		$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
		$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
		$(PRIVATE_TARGET_LIBGCC) \
		$(PRIVATE_TARGET_FDO_LIB) \
		$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
		-o $@ \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_TARGET_LIBGCC) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))
		endef

		define transform-o-to-executable-inner
		$(hide) $(PRIVATE_CXX) \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		-nostdlib -Bdynamic \
		-Wl,-dynamic-linker,/system/bin/linker \
		-Wl,-z,nocopyreloc \
		-fPIE -pie \
		$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
		-Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O)) \
		$(PRIVATE_ALL_OBJECTS) \
		-Wl,--whole-archive \
		$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
		-Wl,--no-whole-archive \
		$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
		$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
		$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
		$(PRIVATE_TARGET_LIBGCC) \
		$(PRIVATE_TARGET_FDO_LIB) \
		$(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
		-o $@ \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_TARGET_LIBGCC) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))
		endef

		define transform-o-to-static-executable-inner
		$(hide) $(PRIVATE_CXX) \
		$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \
		-nostdlib -Bstatic \
		-o $@ \
		$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \
		$(PRIVATE_LDFLAGS) \
		$(PRIVATE_ALL_OBJECTS) \
		-Wl,--whole-archive \
		$(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
		-Wl,--no-whole-archive \
		-Wl,--start-group \
		$(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
		$(PRIVATE_TARGET_FDO_LIB) \
		$(PRIVATE_TARGET_LIBGCC) \
		-Wl,--end-group \
		$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))
		endef

core/combo/arch/x86_64/haswell.mk

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		# Configuration for Linux on x86_64.
		# Generating binaries for Haswell processors.
		#
		ARCH_X86_HAVE_SSSE3 := true
		ARCH_X86_HAVE_SSE4 := true
		ARCH_X86_HAVE_SSE4_1 := true
		ARCH_X86_HAVE_SSE4_2 := true
		ARCH_X86_HAVE_AES_NI := true
		ARCH_X86_HAVE_AVX := true

		# CFLAGS for this arch
		arch_variant_cflags := \
		-march=core-avx2

core/combo/arch/x86_64/ivybridge.mk

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		# Configuration for Linux on x86_64.
		# Generating binaries for Ivy Bridge processors.
		#
		ARCH_X86_HAVE_SSSE3 := true
		ARCH_X86_HAVE_SSE4 := true
		ARCH_X86_HAVE_SSE4_1 := true
		ARCH_X86_HAVE_SSE4_2 := true
		ARCH_X86_HAVE_AES_NI := true
		ARCH_X86_HAVE_AVX := true

		# CFLAGS for this arch
		arch_variant_cflags := \
		-march=core-avx-i

core/combo/arch/x86_64/sandybridge.mk

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		# Configuration for Linux on x86_64.
		# Generating binaries for SandyBridge processors.
		#
		ARCH_X86_HAVE_SSSE3 := true
		ARCH_X86_HAVE_SSE4_1 := true
		ARCH_X86_HAVE_SSE4_2 := true
		ARCH_X86_HAVE_AVX := true

		# CFLAGS for this arch
		arch_variant_cflags := \
		-march=corei7-avx