tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
platform_build/core/combo/TARGET_linux-x86.mk

150 lines
6.4 KiB
Makefile
Raw Normal View History

Get rid of $(combo_target) The only OS-ARCH combo that would have benefited from it is linux-x86, but it explicitly used separate configurations for the HOST_ and TARGET_ side of things. This makes is clear which files are related to the HOST_ configuration and which ones are related to the TARGET_ configuration, and expands $(combo_target) to the only possible/reasonable value that it could have had in every file. This also cleans up the simulator, by moving it in a single place in TARGET_linux_x86 (since the only part that's special is to use HOST_ settings even when building TARGET_ modules). Change-Id: I2420eeb8cfe539f5807ec99cb3177ffb9f2476d5
2010-02-23 21:36:56 +01:00
#
# 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.
#
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
# Configuration for Linux on x86 as a target.
Get rid of $(combo_target) The only OS-ARCH combo that would have benefited from it is linux-x86, but it explicitly used separate configurations for the HOST_ and TARGET_ side of things. This makes is clear which files are related to the HOST_ configuration and which ones are related to the TARGET_ configuration, and expands $(combo_target) to the only possible/reasonable value that it could have had in every file. This also cleans up the simulator, by moving it in a single place in TARGET_linux_x86 (since the only part that's special is to use HOST_ settings even when building TARGET_ modules). Change-Id: I2420eeb8cfe539f5807ec99cb3177ffb9f2476d5
2010-02-23 21:36:56 +01:00
# Included by combo/select.mk
# Provide a default variant.
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),)
TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := x86
Get rid of $(combo_target) The only OS-ARCH combo that would have benefited from it is linux-x86, but it explicitly used separate configurations for the HOST_ and TARGET_ side of things. This makes is clear which files are related to the HOST_ configuration and which ones are related to the TARGET_ configuration, and expands $(combo_target) to the only possible/reasonable value that it could have had in every file. This also cleans up the simulator, by moving it in a single place in TARGET_linux_x86 (since the only part that's special is to use HOST_ settings even when building TARGET_ modules). Change-Id: I2420eeb8cfe539f5807ec99cb3177ffb9f2476d5
2010-02-23 21:36:56 +01:00
endif
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
Decouple platform compiler and NDK library versioning. TARGET_GCC_VERSION: select compiler from prebuilts/gcc/... TARGET_NDK_GCC_VERSION: select libraries from prebuilts/ndk/... Change-Id: I4422a42cdc97aa92b40798014cba82c3c123bbd2
2014-04-11 07:46:26 +02:00
# Decouple NDK library selection with platform compiler version
$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8
Enable lunch command to pick up new toolchain version. Otherwise the previously exported value will be sticky and the value defined in the TARGET makefile is ignored. Change-Id: I13b9cca2d288f7ab09104c57e7cad9f23de2548a
2012-12-13 01:22:54 +01:00
ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8
Enable lunch command to pick up new toolchain version. Otherwise the previously exported value will be sticky and the value defined in the TARGET makefile is ignored. Change-Id: I13b9cca2d288f7ab09104c57e7cad9f23de2548a
2012-12-13 01:22:54 +01:00
else
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
Define TARGET_GCC_VERSION in target specific make files. So that GCC refresh can be performed in a target specific way. Change-Id: I867e8b8fd671bef8c5af300e657a6da4fface032
2012-12-11 23:01:10 +01:00
endif
x86: Refine the way we configure the x86 build. This is the result of a recent conversation around the x86 ABI and its relationship with how we build platform images. Briefly: - We want to use feature-based macros like ARCH_X86_HAVE_$FEATURE instead of relying on explicit compiler macros like -DUSE_$FEATURE - We want to allow for other x86-based arch variants, e.g. if someone wants to build Android for a CPU that doesn't support the NDK x86 ABI. However, we need to ensure these are not tagged compatible by mistake (see check at the end of TARGET_linux-x86.mk) - There are several flags which use is dubious now that we have a dedicated toolchain to build all the x86 stuff. Comment them as 'to be considered for removal'. We'll do the proper checks later. Change-Id: I7768d7c34d73e274cbf4c09ae831b55280d6bb58
2011-12-13 17:21:56 +01:00
# 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
#
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT).mk
x86: Refine the way we configure the x86 build. This is the result of a recent conversation around the x86 ABI and its relationship with how we build platform images. Briefly: - We want to use feature-based macros like ARCH_X86_HAVE_$FEATURE instead of relying on explicit compiler macros like -DUSE_$FEATURE - We want to allow for other x86-based arch variants, e.g. if someone wants to build Android for a CPU that doesn't support the NDK x86 ABI. However, we need to ensure these are not tagged compatible by mistake (see check at the end of TARGET_linux-x86.mk) - There are several flags which use is dubious now that we have a dedicated toolchain to build all the x86 stuff. Comment them as 'to be considered for removal'. We'll do the proper checks later. Change-Id: I7768d7c34d73e274cbf4c09ae831b55280d6bb58
2011-12-13 17:21:56 +01:00
ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(error Unknown $(TARGET_$(combo_2nd_arch_prefix)ARCH) architecture version: $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT))
x86: Refine the way we configure the x86 build. This is the result of a recent conversation around the x86 ABI and its relationship with how we build platform images. Briefly: - We want to use feature-based macros like ARCH_X86_HAVE_$FEATURE instead of relying on explicit compiler macros like -DUSE_$FEATURE - We want to allow for other x86-based arch variants, e.g. if someone wants to build Android for a CPU that doesn't support the NDK x86 ABI. However, we need to ensure these are not tagged compatible by mistake (see check at the end of TARGET_linux-x86.mk) - There are several flags which use is dubious now that we have a dedicated toolchain to build all the x86 stuff. Comment them as 'to be considered for removal'. We'll do the proper checks later. Change-Id: I7768d7c34d73e274cbf4c09ae831b55280d6bb58
2011-12-13 17:21:56 +01:00
endif
include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
Refactor FDO support code to ensure arm64 can also be built with FDO. Change-Id: I752c9f411b0a046a15c72b4837efc1fb0503b470
2014-07-23 23:28:58 +02:00
include $(BUILD_SYSTEM)/combo/fdo.mk
x86: Refine the way we configure the x86 build. This is the result of a recent conversation around the x86 ABI and its relationship with how we build platform images. Briefly: - We want to use feature-based macros like ARCH_X86_HAVE_$FEATURE instead of relying on explicit compiler macros like -DUSE_$FEATURE - We want to allow for other x86-based arch variants, e.g. if someone wants to build Android for a CPU that doesn't support the NDK x86 ABI. However, we need to ensure these are not tagged compatible by mistake (see check at the end of TARGET_linux-x86.mk) - There are several flags which use is dubious now that we have a dedicated toolchain to build all the x86 stuff. Comment them as 'to be considered for removal'. We'll do the proper checks later. Change-Id: I7768d7c34d73e274cbf4c09ae831b55280d6bb58
2011-12-13 17:21:56 +01:00
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
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-
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
endif
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(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)
Add a method to leave the symbol table in a library. When LOCAL_STRIP_MODULE := keep_symbols is set, then the normal strip rules will be modified so that only the .debug_* sections are removed. The original symbol table is left alone. This allows the compilation of certain libraries so that libbacktrace library can provide meaningful names to functions. Bug: 12958251 Change-Id: I82bdc304a463012e29086325ccb51163464cb4a9
2014-03-18 22:50:09 +01:00
$(combo_2nd_arch_prefix)TARGET_READELF := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)readelf$(HOST_EXECUTABLE_SUFFIX)
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_STRIP := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
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)
Add -latomic to all target builds Projects using stdatomic.h needs libatomic.a in case compiler can't expand all __atomic* intrinsics. eg, __atomic_is_lock_free in armeabi/mips. Adding libatomic.a globally makes more sense than adding "LOCAL_LDLIB += -latomic " in each project including <stdatomic.h>. Projects don't need atomic operations won't get redundant DT_NEEDED entry because libatomic.a is not a shared library. Change-Id: I81dbf524544c848e667e18ab5eeabff75b5063ef
2014-05-29 11:47:27 +02:00
$(combo_2nd_arch_prefix)TARGET_LIBATOMIC := \
$(shell $($(combo_2nd_arch_prefix)TARGET_CC) -m32 -print-file-name=libatomic.a)
Add option for generating coverage info. To enable building with coverage, the environment variable NATIVE_COVERAGE must be set to true. Set `LOCAL_NATIVE_COVERAGE := true` to generate coverage information for a given component. This is currently not supported for clang (b/17574078, b/17583330). If static library A is included in a binary B (dynamic or static executable, or shared library), and A is built with coverage information, B is required to link with libgcov.a. Since the make does not offer a good way to track this dependency, link libgcov.a even if LOCAL_NATIVE_COVERAGE is not set (but still guarded by NATIVE_COVERAGE). This ensures that all of the libgcov dependencies will always be resolved, and causes no change in the resulting binary if coverage is not used. Bug: 10134489 Change-Id: Id5a19f2c215e4be80e6eae27ecc19b582f2f6813
2014-09-19 23:25:57 +02:00
$(combo_2nd_arch_prefix)TARGET_LIBGCOV := \
$(shell $($(combo_2nd_arch_prefix)TARGET_CC) -m32 -print-file-name=libgcov.a)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
endif
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
libc_root := bionic/libc
libm_root := bionic/libm
Remove obsolete CUSTOM_KERNEL_HEADERS. Change-Id: Id260dd351b90f065eee56e231d4c341b18c1b27f
2014-01-11 01:35:08 +01:00
KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi
Fix KERNEL_HEADERS_ARCH for mips and x86. arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64 use headers that work for both widths. So where arm/arm64 need to handle the second architecture case specially, all we need to do for the others is hard-code the name. (x86_64.mk already hard-codes x86; we need to change x86.mk for the case where we're building the 32-bit binaries for a mixed system. mips64.mk doesn't exist yet, but when it does, it'll hard-code just plain "mips" too.) Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197
2014-01-28 22:07:55 +01:00
KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64.
Switch x86 over to uapi-only. Bug: 11559337 Change-Id: I95aa40ec2094acdaef1d4b4d9f0dd6278cf558d1
2013-11-26 01:38:47 +01:00
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
No need to filter out AndroidConfig.h for unbundled build for now we have all AndroidConfig.hs in the build project. Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
2013-08-15 20:01:10 +02:00
android_config_h := $(call select-android-config-h,target_linux-x86)
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
Clean up of X86 build flags Review and clean-up of both compiler and linker flags to ensure proper usage and consistency for images, toolchain, SDK, and NDK. Change-Id: Ife75c32cd49b32345712dee28fa5f2283069a90e Signed-off-by: Mark D Horn <mark.d.horn@intel.com> Author: Bruce Beare <bruce.j.beare@intel.com>
2011-04-26 23:15:26 +02:00
-O2 \
-Wa,--noexecstack \
-Werror=format-security \
x86/mips: enable _FORTIFY_SOURCE=2 Enable _FORTIFY_SOURCE=2 for x86 and MIPS. Currently, this change is a no-op, as Android's libc doesn't support _FORTIFY_SOURCE > 1, yet. The ARM change was made in 316f720b91f879c4e3972d6d595535de0ac707b2 Change-Id: Iafe90beadf9b6a41ea294b7107cf4f18141acf3a
2013-04-29 21:41:53 +02:00
-D_FORTIFY_SOURCE=2 \
Clean up of X86 build flags Review and clean-up of both compiler and linker flags to ensure proper usage and consistency for images, toolchain, SDK, and NDK. Change-Id: Ife75c32cd49b32345712dee28fa5f2283069a90e Signed-off-by: Mark D Horn <mark.d.horn@intel.com> Author: Bruce Beare <bruce.j.beare@intel.com>
2011-04-26 23:15:26 +02:00
-Wstrict-aliasing=2 \
-ffunction-sections \
-finline-functions \
-finline-limit=300 \
-fno-short-enums \
-fstrict-aliasing \
-funswitch-loops \
-funwind-tables \
Extend x86 to have different arch variants Author: Negreanu Marius Adrian <adrian.m.negreanu@intel.com> Author: Andrew Boie <andrew.p.boie@intel.com> Author: Daniel Leung <daniel.leung@intel.com> Currently, x86 target only has generic i686 and x86-atom as arch variants. This patch adds the ability to have more than two arch variants. Defining a new arch variant is similiar to ARM targets, by adding a new file in core/combo/arch/x86. These files also define what capabilities the targeting CPU has (e.g. having SSE2, SSE3, etc.). We define arch variants for Sandy Bridge, Ivy Bridge, Haswell; upcoming arches can be easily added to this set with future patches. Change-Id: Iafbce10d205e860738db4a216ff603f9a84d7311 Signed-off-by: Daniel Leung <daniel.leung@intel.com> Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2011-09-28 16:47:50 +02:00
-fstack-protector \
resolved conflicts for merge of 70190a2b to klp-dev-plus-aosp Change-Id: I9abcb4e258ad95912860dcae2973c4e417b05369
2013-09-19 19:15:38 +02:00
-m32 \
Disable canonical prefixes of system headers GCC know a few pre-defined paths (relative to its location) to search for headers, libraries, program, etc. By default GCC prefixes its own path(argv[0]) and calls realpath() which result in absolute path with all symlink, . and .. removed. It's usually good to have canonicalised paths, but absolute paths in *.d file can cause unnecessary relinking when stale entries in ccache cache hit Add -no-canonical-prefixes (gcc>=4.6) and -fno-canonical-system-headers (gcc>4.6) to disable realpath() on prefixed paths Change-Id: I58d739e61fb013015fb05a9c98b2132b307f915a
2014-05-09 08:13:13 +02:00
-no-canonical-prefixes \
-fno-canonical-system-headers \
No need to filter out AndroidConfig.h for unbundled build for now we have all AndroidConfig.hs in the build project. Change-Id: Id713fecba1378fad81688f5937f61c779b618ac2
2013-08-15 20:01:10 +02:00
-include $(android_config_h) \
-I $(dir $(android_config_h))
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags)
x86: The default ATOM BSP flags need to be in sync with the NDK ABI Change-Id: Ic741e1795c655ace1e33ae6708219f2708358090 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-09 22:27:08 +01:00
x86: Refine the way we configure the x86 build. This is the result of a recent conversation around the x86 ABI and its relationship with how we build platform images. Briefly: - We want to use feature-based macros like ARCH_X86_HAVE_$FEATURE instead of relying on explicit compiler macros like -DUSE_$FEATURE - We want to allow for other x86-based arch variants, e.g. if someone wants to build Android for a CPU that doesn't support the NDK x86 ABI. However, we need to ensure these are not tagged compatible by mistake (see check at the end of TARGET_linux-x86.mk) - There are several flags which use is dubious now that we have a dedicated toolchain to build all the x86 stuff. Comment them as 'to be considered for removal'. We'll do the proper checks later. Change-Id: I7768d7c34d73e274cbf4c09ae831b55280d6bb58
2011-12-13 17:21:56 +01:00
ifeq ($(ARCH_X86_HAVE_SSSE3),true) # yes, really SSSE3, not SSE3!
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3
Extend x86 to have different arch variants Author: Negreanu Marius Adrian <adrian.m.negreanu@intel.com> Author: Andrew Boie <andrew.p.boie@intel.com> Author: Daniel Leung <daniel.leung@intel.com> Currently, x86 target only has generic i686 and x86-atom as arch variants. This patch adds the ability to have more than two arch variants. Defining a new arch variant is similiar to ARM targets, by adding a new file in core/combo/arch/x86. These files also define what capabilities the targeting CPU has (e.g. having SSE2, SSE3, etc.). We define arch variants for Sandy Bridge, Ivy Bridge, Haswell; upcoming arches can be easily added to this set with future patches. Change-Id: Iafbce10d205e860738db4a216ff603f9a84d7311 Signed-off-by: Daniel Leung <daniel.leung@intel.com> Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2011-09-28 16:47:50 +02:00
endif
ifeq ($(ARCH_X86_HAVE_SSE4),true)
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -msse4
Extend x86 to have different arch variants Author: Negreanu Marius Adrian <adrian.m.negreanu@intel.com> Author: Andrew Boie <andrew.p.boie@intel.com> Author: Daniel Leung <daniel.leung@intel.com> Currently, x86 target only has generic i686 and x86-atom as arch variants. This patch adds the ability to have more than two arch variants. Defining a new arch variant is similiar to ARM targets, by adding a new file in core/combo/arch/x86. These files also define what capabilities the targeting CPU has (e.g. having SSE2, SSE3, etc.). We define arch variants for Sandy Bridge, Ivy Bridge, Haswell; upcoming arches can be easily added to this set with future patches. Change-Id: Iafbce10d205e860738db4a216ff603f9a84d7311 Signed-off-by: Daniel Leung <daniel.leung@intel.com> Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2011-09-28 16:47:50 +02:00
endif
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -msse4.1
Extend x86 to have different arch variants Author: Negreanu Marius Adrian <adrian.m.negreanu@intel.com> Author: Andrew Boie <andrew.p.boie@intel.com> Author: Daniel Leung <daniel.leung@intel.com> Currently, x86 target only has generic i686 and x86-atom as arch variants. This patch adds the ability to have more than two arch variants. Defining a new arch variant is similiar to ARM targets, by adding a new file in core/combo/arch/x86. These files also define what capabilities the targeting CPU has (e.g. having SSE2, SSE3, etc.). We define arch variants for Sandy Bridge, Ivy Bridge, Haswell; upcoming arches can be easily added to this set with future patches. Change-Id: Iafbce10d205e860738db4a216ff603f9a84d7311 Signed-off-by: Daniel Leung <daniel.leung@intel.com> Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2011-09-28 16:47:50 +02:00
endif
ifeq ($(ARCH_X86_HAVE_SSE4_2),true)
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -msse4.2
Extend x86 to have different arch variants Author: Negreanu Marius Adrian <adrian.m.negreanu@intel.com> Author: Andrew Boie <andrew.p.boie@intel.com> Author: Daniel Leung <daniel.leung@intel.com> Currently, x86 target only has generic i686 and x86-atom as arch variants. This patch adds the ability to have more than two arch variants. Defining a new arch variant is similiar to ARM targets, by adding a new file in core/combo/arch/x86. These files also define what capabilities the targeting CPU has (e.g. having SSE2, SSE3, etc.). We define arch variants for Sandy Bridge, Ivy Bridge, Haswell; upcoming arches can be easily added to this set with future patches. Change-Id: Iafbce10d205e860738db4a216ff603f9a84d7311 Signed-off-by: Daniel Leung <daniel.leung@intel.com> Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2011-09-28 16:47:50 +02:00
endif
ifeq ($(ARCH_X86_HAVE_AVX),true)
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -mavx
Extend x86 to have different arch variants Author: Negreanu Marius Adrian <adrian.m.negreanu@intel.com> Author: Andrew Boie <andrew.p.boie@intel.com> Author: Daniel Leung <daniel.leung@intel.com> Currently, x86 target only has generic i686 and x86-atom as arch variants. This patch adds the ability to have more than two arch variants. Defining a new arch variant is similiar to ARM targets, by adding a new file in core/combo/arch/x86. These files also define what capabilities the targeting CPU has (e.g. having SSE2, SSE3, etc.). We define arch variants for Sandy Bridge, Ivy Bridge, Haswell; upcoming arches can be easily added to this set with future patches. Change-Id: Iafbce10d205e860738db4a216ff603f9a84d7311 Signed-off-by: Daniel Leung <daniel.leung@intel.com> Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2011-09-28 16:47:50 +02:00
endif
ifeq ($(ARCH_X86_HAVE_AES_NI),true)
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -maes
IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-10-14 23:12:46 +02:00
endif
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -m32
x86: Refine the way we configure the x86 build. This is the result of a recent conversation around the x86 ABI and its relationship with how we build platform images. Briefly: - We want to use feature-based macros like ARCH_X86_HAVE_$FEATURE instead of relying on explicit compiler macros like -DUSE_$FEATURE - We want to allow for other x86-based arch variants, e.g. if someone wants to build Android for a CPU that doesn't support the NDK x86 ABI. However, we need to ensure these are not tagged compatible by mistake (see check at the end of TARGET_linux-x86.mk) - There are several flags which use is dubious now that we have a dedicated toolchain to build all the x86 stuff. Comment them as 'to be considered for removal'. We'll do the proper checks later. Change-Id: I7768d7c34d73e274cbf4c09ae831b55280d6bb58
2011-12-13 17:21:56 +01:00
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack
$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,-z,relro -Wl,-z,now
Emit unique linker buildid in all binaries. We want to store the symbol information for all android binaries in a global database. * We ingest unstripped binaries into the global database * When we collect address data from device (e.g. instruction pointer address), we want to lookup its symbol information through the global database. The key of the mapping is a unique build id, which is the same between binaries on device (stripped) and unstripped binaries. After applying this patch, the system.img size increases by 0.0047% (16.3KB). Change-Id: Id92faf2951f43a30947e8d2b690c1af6bf7e3f54
2015-01-14 20:21:22 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,--build-id=md5
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(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
Switch --hash-style to gnu Bug: 18373609 Change-Id: Ia2c965fb86295858d9a97db2ec8d54d99e3d431f
2014-11-13 23:51:10 +01:00
$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -Wl,--hash-style=gnu
IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586 Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-10-14 23:12:46 +02:00
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
$(libc_root)/arch-x86/include \
$(libc_root)/include \
$(KERNEL_HEADERS) \
$(libm_root)/include \
$(libm_root)/include/i387 \
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(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
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(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
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
Fix x86 config file to support 2nd ARCH build Change-Id: I5f6091c555b9e742303f294b7c07a981ae5c6026 Signed-off-by: Qiming Shi <qiming.shi@intel.com>
2014-02-17 08:13:48 +01:00
$(combo_2nd_arch_prefix)TARGET_STRIP_MODULE:=true
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
Move selection of C++ STL into the build system. Preparing for migration from stlport to libc++. STL selection is done with LOCAL_CXX_STL (valid values are default, none, libc++, libc++_static, stlport, stlport_static, bionic). The selection of the STL is as follows: if LOCAL_CXX_STL == 'default' ifdef LOCAL_SDK_VERSION Use whatever STL the other NDK options have selected. else Use bionic's libstdc++ for target, GNU libstdc++ for host. This is compatible with the existing build options. endif else if LOCAL_CXX_STL == 'stlport' Use stlport. else if LOCAL_CXX_STL == 'libc++' Use libc++. else if LOCAL_CXX_STL == '' Don't use any STL. endif endif Bug: 15193147 Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540
2014-09-12 23:46:57 +02:00
$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libm
auto import from //depot/cupcake/@135843
2009-03-04 04:28:42 +01:00
Refactor transform-o-to-* definitions. Previously, there was one generic definition for each of the transform-o-to-* functions in definitions.mk, and one target specific one in each combo/TARGET_*.mk. The generic one was entirely unused, and the target specific ones were all nearly identical. Changing anything in these functions was tedious at best, and often error prone. The differences between any 32-bit arch and its 64-bit equivalent were restricted to the name of the linker, and the ARM and MIPS definitions were identical. The few differences between ARM and x86 looked to be compatibility for an old (ca. 2008) toolchain issue with --gc-sections, and a bug (LDFLAGS coming first rather than later). To simplify things, I've moved the definitions for these out of combo/TARGET_*.mk and back into definitions.mk. The differences between ARM and x86 have been scrapped. Anything that really does still need to be target specific can be handled as I have the linker: add a TARGET_FOO variable to the given target and then add it to the generic definition. Change-Id: I54dc1bffc32ac39f27f0b87247dd6a6dbaf0b162
2014-11-13 19:15:46 +01:00
$(combo_2nd_arch_prefix)TARGET_LINKER := /system/bin/linker
Reference in a new issue Copy permalink