diff --git a/build/core/clang/TARGET_arm copy.mk b/build/core/clang/TARGET_arm copy.mk new file mode 100644 index 0000000..59ed41f --- /dev/null +++ b/build/core/clang/TARGET_arm copy.mk @@ -0,0 +1,57 @@ + +include $(BUILD_SYSTEM)/clang/arm.mk + +CLANG_CONFIG_arm_TARGET_TRIPLE := arm-linux-androideabi +CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX := \ + $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm_TARGET_TRIPLE)/bin + +CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS := \ + $(CLANG_CONFIG_EXTRA_ASFLAGS) \ + $(CLANG_CONFIG_TARGET_EXTRA_ASFLAGS) \ + $(CLANG_CONFIG_arm_EXTRA_ASFLAGS) \ + -target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \ + -B$(CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX) + +CLANG_CONFIG_arm_TARGET_EXTRA_CFLAGS := \ + $(CLANG_CONFIG_EXTRA_CFLAGS) \ + $(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \ + $(CLANG_CONFIG_arm_EXTRA_CFLAGS) \ + -target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \ + $(CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS) + +CLANG_CONFIG_arm_TARGET_EXTRA_CPPFLAGS := \ + $(CLANG_CONFIG_EXTRA_CPPFLAGS) \ + $(CLANG_CONFIG_TARGET_EXTRA_CPPFLAGS) \ + $(CLANG_CONFIG_arm_EXTRA_CPPFLAGS) \ + -target $(CLANG_CONFIG_arm_TARGET_TRIPLE) + +CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS := \ + $(CLANG_CONFIG_EXTRA_LDFLAGS) \ + $(CLANG_CONFIG_TARGET_EXTRA_LDFLAGS) \ + $(CLANG_CONFIG_arm_EXTRA_LDFLAGS) \ + -target $(CLANG_CONFIG_arm_TARGET_TRIPLE) \ + -B$(CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX) + + +define $(clang_2nd_arch_prefix)convert-to-clang-flags + $(strip \ + $(call subst-clang-incompatible-arm-flags,\ + $(filter-out $(CLANG_CONFIG_arm_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_arm_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_arm_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_arm_TARGET_EXTRA_LDFLAGS) + +$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi +$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := +RS_COMPAT_TRIPLE := armv7-none-linux-gnueabi diff --git a/build/core/combo/TARGET_linux-arm64.mk b/build/core/combo/TARGET_linux-arm64.mk deleted file mode 100644 index 07d3984..0000000 --- a/build/core/combo/TARGET_linux-arm64.mk +++ /dev/null @@ -1,232 +0,0 @@ -# -# Copyright (C) 2013 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 ARM. -# Included by combo/select.mk - -# You can set TARGET_ARCH_VARIANT to use an arch version other -# than ARMv5TE. Each value should correspond to a file named -# $(BUILD_COMBOS)/arch/.mk which must contain -# makefile variable definitions similar to the preprocessor -# defines in build/core/combo/include/arch//AndroidConfig.h. Their -# purpose is to allow module Android.mk files to selectively compile -# different versions of code based upon the funtionality and -# instructions available in a given architecture version. -# -# The blocks also define specific arch_variant_cflags, which -# include defines, and compiler settings for the given architecture -# version. -# -ifeq ($(strip $(TARGET_ARCH_VARIANT)),) -TARGET_ARCH_VARIANT := armv8 -endif - -# Decouple NDK library selection with platform compiler version -TARGET_NDK_GCC_VERSION := 4.9 - -ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) -TARGET_GCC_VERSION := 4.9 -else -TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) -endif - -TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk -ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) -$(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT)) -endif - -include $(TARGET_ARCH_SPECIFIC_MAKEFILE) -include $(BUILD_SYSTEM)/combo/fdo.mk - -# 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)/aarch64/aarch64-linux-android-$(TARGET_GCC_VERSION) -TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/aarch64-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_READELF := $(TARGET_TOOLS_PREFIX)readelf$(HOST_EXECUTABLE_SUFFIX) -TARGET_STRIP := $(TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX) - -TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined - -TARGET_GLOBAL_CFLAGS += \ - -fno-strict-aliasing \ - -android_config_h := $(call select-android-config-h,linux-arm64) - -TARGET_GLOBAL_CFLAGS += \ - -fstack-protector \ - -ffunction-sections \ - -fdata-sections \ - -funwind-tables \ - -Wa,--noexecstack \ - -Werror=format-security \ - -D_FORTIFY_SOURCE=2 \ - -fno-short-enums \ - -no-canonical-prefixes \ - -fno-canonical-system-headers \ - $(arch_variant_cflags) \ - -include $(android_config_h) \ - -I $(dir $(android_config_h)) - -# Help catch common 32/64-bit errors. -TARGET_GLOBAL_CFLAGS += \ - -Werror=pointer-to-int-cast \ - -Werror=int-to-pointer-cast \ - -TARGET_GLOBAL_CFLAGS += -fno-strict-volatile-bitfields - -# This is to avoid the dreaded warning compiler message: -# note: the mangling of 'va_list' has changed in GCC 4.4 -# -# The fact that the mangling changed does not affect the NDK ABI -# very fortunately (since none of the exposed APIs used va_list -# in their exported C++ functions). Also, GCC 4.5 has already -# removed the warning from the compiler. -# -TARGET_GLOBAL_CFLAGS += -Wno-psabi - -TARGET_GLOBAL_LDFLAGS += \ - -Wl,-z,noexecstack \ - -Wl,-z,relro \ - -Wl,-z,now \ - -Wl,--warn-shared-textrel \ - -Wl,--fatal-warnings \ - -Wl,-maarch64linux \ - $(arch_variant_ldflags) - -TARGET_GLOBAL_CPPFLAGS += -fvisibility-inlines-hidden - -# More flags/options can be added here -TARGET_RELEASE_CFLAGS := \ - -DNDEBUG \ - -O2 -g \ - -Wstrict-aliasing=2 \ - -fgcse-after-reload \ - -frerun-cse-after-loop \ - -frename-registers - -libc_root := bionic/libc -libm_root := bionic/libm -libstdc++_root := bionic/libstdc++ - -TARGET_LIBGCC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \ - -print-libgcc-file-name) -TARGET_LIBATOMIC := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) \ - -print-file-name=libatomic.a) - -KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi -KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) -KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) - -TARGET_C_INCLUDES := \ - $(libc_root)/arch-arm64/include \ - $(libc_root)/include \ - $(libstdc++_root)/include \ - $(KERNEL_HEADERS) \ - $(libm_root)/include \ - $(libm_root)/include/arm64 \ - -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) \ - -nostdlib -Wl,-soname,$(notdir $@) \ - -Wl,--gc-sections \ - $(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \ - $(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) \ - $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ - $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ - -o $@ \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \ - $(PRIVATE_LDLIBS) -endef - -define transform-o-to-executable-inner -$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -pie \ - -Wl,-dynamic-linker,/system/bin/linker64 \ - -Wl,--gc-sections \ - -Wl,-z,nocopyreloc \ - $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - -Wl,-rpath-link=$(PRIVATE_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) \ - $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ - $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ - -o $@ \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \ - $(PRIVATE_LDLIBS) -endef - -define transform-o-to-static-executable-inner -$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ - -Wl,--gc-sections \ - -o $@ \ - $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_ALL_OBJECTS) \ - -Wl,--whole-archive \ - $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ - -Wl,--no-whole-archive \ - $(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \ - -Wl,--start-group \ - $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ - $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - -Wl,--end-group \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) -endef diff --git a/build/core/combo/TARGET_linux-mips.mk b/build/core/combo/TARGET_linux-mips.mk deleted file mode 100644 index 995e63c..0000000 --- a/build/core/combo/TARGET_linux-mips.mk +++ /dev/null @@ -1,238 +0,0 @@ -# -# Copyright (C) 2010 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 MIPS. -# Included by combo/select.mk - -# You can set TARGET_ARCH_VARIANT to use an arch version other -# than mips32r2-fp. Each value should correspond to a file named -# $(BUILD_COMBOS)/arch/.mk which must contain -# makefile variable definitions similar to the preprocessor -# defines in build/core/combo/include/arch//AndroidConfig.h. Their -# purpose is to allow module Android.mk files to selectively compile -# different versions of code based upon the funtionality and -# instructions available in a given architecture version. -# -# The blocks also define specific arch_variant_cflags, which -# include defines, and compiler settings for the given architecture -# version. -# -ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),) -TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := mips32r2-fp -endif - -# Decouple NDK library selection with platform compiler version -$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8 - -ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) -$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9 -else -$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) -endif - -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 MIPS architecture variant: $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)) -endif - -include $(TARGET_ARCH_SPECIFIC_MAKEFILE) -include $(BUILD_SYSTEM)/combo/fdo.mk - -# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else -ifeq ($(strip $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)),) -$(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/mips/mips64el-linux-android-$($(combo_2nd_arch_prefix)TARGET_GCC_VERSION) -$(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX := $($(combo_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/bin/mips64el-linux-android- -endif - -$(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_READELF := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)readelf$(HOST_EXECUTABLE_SUFFIX) -$(combo_2nd_arch_prefix)TARGET_STRIP := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX) - -$(combo_2nd_arch_prefix)TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined - -TARGET_mips_CFLAGS := -O2 \ - -fomit-frame-pointer \ - -fno-strict-aliasing \ - -funswitch-loops - -# Set FORCE_MIPS_DEBUGGING to "true" in your buildspec.mk -# or in your environment to gdb debugging easier. -# Don't forget to do a clean build. -ifeq ($(FORCE_MIPS_DEBUGGING),true) - TARGET_mips_CFLAGS += -fno-omit-frame-pointer -endif - -android_config_h := $(call select-android-config-h,linux-mips) - -$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ - $(TARGET_mips_CFLAGS) \ - -U__unix -U__unix__ -Umips \ - -ffunction-sections \ - -fdata-sections \ - -funwind-tables \ - -Wa,--noexecstack \ - -Werror=format-security \ - -D_FORTIFY_SOURCE=2 \ - -no-canonical-prefixes \ - -fno-canonical-system-headers \ - $(arch_variant_cflags) \ - -include $(android_config_h) \ - -I $(dir $(android_config_h)) - -ifneq ($(ARCH_MIPS_PAGE_SHIFT),) -$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -DPAGE_SHIFT=$(ARCH_MIPS_PAGE_SHIFT) -endif - -$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += \ - -Wl,-z,noexecstack \ - -Wl,-z,relro \ - -Wl,-z,now \ - -Wl,--warn-shared-textrel \ - -Wl,--fatal-warnings \ - $(arch_variant_ldflags) - -$(combo_2nd_arch_prefix)TARGET_GLOBAL_CPPFLAGS += -fvisibility-inlines-hidden - -# More flags/options can be added here -$(combo_2nd_arch_prefix)TARGET_RELEASE_CFLAGS := \ - -DNDEBUG \ - -g \ - -Wstrict-aliasing=2 \ - -fgcse-after-reload \ - -frerun-cse-after-loop \ - -frename-registers - -libc_root := bionic/libc -libm_root := bionic/libm -libstdc++_root := bionic/libstdc++ - - -## on some hosts, the target cross-compiler is not available so do not run this command -ifneq ($(wildcard $($(combo_2nd_arch_prefix)TARGET_CC)),) -# We compile with the global cflags to ensure that -# any flags which affect libgcc are correctly taken -# into account. -$(combo_2nd_arch_prefix)TARGET_LIBGCC := \ - $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) -print-file-name=libgcc.a) -$(combo_2nd_arch_prefix)TARGET_LIBATOMIC := \ - $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) -print-file-name=libatomic.a) -LIBGCC_EH := $(shell $($(combo_2nd_arch_prefix)TARGET_CC) $($(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS) -print-file-name=libgcc_eh.a) -ifneq ($(LIBGCC_EH),libgcc_eh.a) - $(combo_2nd_arch_prefix)TARGET_LIBGCC += $(LIBGCC_EH) -endif -endif - -KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi -KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-mips # mips covers both mips and mips64. -KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) - -$(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \ - $(libc_root)/arch-mips/include \ - $(libc_root)/include \ - $(libstdc++_root)/include \ - $(KERNEL_HEADERS) \ - $(libm_root)/include \ - $(libm_root)/include/mips \ - -$(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 - -$(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 - -$(combo_2nd_arch_prefix)TARGET_STRIP_MODULE:=true - -$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm - -$(combo_2nd_arch_prefix)TARGET_CUSTOM_LD_COMMAND := true - -define $(combo_2nd_arch_prefix)transform-o-to-shared-lib-inner -$(hide) $(PRIVATE_CXX) \ - -nostdlib -Wl,-soname,$(notdir $@) \ - -Wl,--gc-sections \ - $(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \ - $(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) \ - $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ - $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ - -o $@ \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \ - $(PRIVATE_LDLIBS) -endef - -define $(combo_2nd_arch_prefix)transform-o-to-executable-inner -$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -pie \ - -Wl,-dynamic-linker,/system/bin/linker \ - -Wl,--gc-sections \ - -Wl,-z,nocopyreloc \ - $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - -Wl,-rpath-link=$(PRIVATE_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) \ - $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ - $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ - -o $@ \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \ - $(PRIVATE_LDLIBS) -endef - -define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner -$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ - -Wl,--gc-sections \ - -o $@ \ - $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_ALL_OBJECTS) \ - -Wl,--whole-archive \ - $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ - -Wl,--no-whole-archive \ - $(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \ - -Wl,--start-group \ - $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ - $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - -Wl,--end-group \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) -endef diff --git a/build/core/combo/TARGET_linux-mips64.mk b/build/core/combo/TARGET_linux-mips64.mk deleted file mode 100644 index 4511b47..0000000 --- a/build/core/combo/TARGET_linux-mips64.mk +++ /dev/null @@ -1,242 +0,0 @@ -# -# Copyright (C) 2013 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 MIPS64. -# Included by combo/select.mk - -# You can set TARGET_ARCH_VARIANT to use an arch version other -# than mips64. Each value should correspond to a file named -# $(BUILD_COMBOS)/arch/.mk which must contain -# makefile variable definitions similar to the preprocessor -# defines in build/core/combo/include/arch//AndroidConfig.h. Their -# purpose is to allow module Android.mk files to selectively compile -# different versions of code based upon the funtionality and -# instructions available in a given architecture version. -# -# The blocks also define specific arch_variant_cflags, which -# include defines, and compiler settings for the given architecture -# version. -# -ifeq ($(strip $(TARGET_ARCH_VARIANT)),) -TARGET_ARCH_VARIANT := mips64r6 -endif - -# Decouple NDK library selection with platform compiler version -TARGET_NDK_GCC_VERSION := 4.8 - -ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) -TARGET_GCC_VERSION := 4.9 -else -TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) -endif - -TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_ARCH)/$(TARGET_ARCH_VARIANT).mk -ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) -$(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT)) -endif - -include $(TARGET_ARCH_SPECIFIC_MAKEFILE) -include $(BUILD_SYSTEM)/combo/fdo.mk - -# 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)/mips/mips64el-linux-android-$(TARGET_GCC_VERSION) -TARGET_TOOLS_PREFIX := $(TARGET_TOOLCHAIN_ROOT)/bin/mips64el-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_READELF := $(TARGET_TOOLS_PREFIX)readelf$(HOST_EXECUTABLE_SUFFIX) -TARGET_STRIP := $(TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX) - -TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined - -TARGET_mips_CFLAGS := -O2 \ - -fomit-frame-pointer \ - -fno-strict-aliasing \ - -funswitch-loops - -# Set FORCE_MIPS_DEBUGGING to "true" in your buildspec.mk -# or in your environment to gdb debugging easier. -# Don't forget to do a clean build. -ifeq ($(FORCE_MIPS_DEBUGGING),true) - TARGET_mips_CFLAGS += -fno-omit-frame-pointer -endif - -android_config_h := $(call select-android-config-h,linux-mips64) - -TARGET_GLOBAL_CFLAGS += \ - $(TARGET_mips_CFLAGS) \ - -U__unix -U__unix__ -Umips \ - -ffunction-sections \ - -fdata-sections \ - -funwind-tables \ - -Wa,--noexecstack \ - -Werror=format-security \ - -D_FORTIFY_SOURCE=2 \ - -no-canonical-prefixes \ - -fno-canonical-system-headers \ - $(arch_variant_cflags) \ - -include $(android_config_h) \ - -I $(dir $(android_config_h)) - -ifneq ($(ARCH_MIPS_PAGE_SHIFT),) -TARGET_GLOBAL_CFLAGS += -DPAGE_SHIFT=$(ARCH_MIPS_PAGE_SHIFT) -endif - -TARGET_GLOBAL_LDFLAGS += \ - -Wl,-z,noexecstack \ - -Wl,-z,relro \ - -Wl,-z,now \ - -Wl,--warn-shared-textrel \ - -Wl,--fatal-warnings \ - $(arch_variant_ldflags) - -TARGET_GLOBAL_CPPFLAGS += -fvisibility-inlines-hidden - -# More flags/options can be added here -TARGET_RELEASE_CFLAGS := \ - -DNDEBUG \ - -g \ - -Wstrict-aliasing=2 \ - -fgcse-after-reload \ - -frerun-cse-after-loop \ - -frename-registers - -libc_root := bionic/libc -libm_root := bionic/libm -libstdc++_root := bionic/libstdc++ -libthread_db_root := bionic/libthread_db - - -## on some hosts, the target cross-compiler is not available so do not run this command -ifneq ($(wildcard $(TARGET_CC)),) -# We compile with the global cflags to ensure that -# any flags which affect libgcc are correctly taken -# into account. -TARGET_LIBGCC := \ - $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) -print-file-name=libgcc.a) -TARGET_LIBATOMIC := \ - $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) -print-file-name=libatomic.a) -LIBGCC_EH := $(shell $(TARGET_CC) $(TARGET_GLOBAL_CFLAGS) -print-file-name=libgcc_eh.a) -ifneq ($(LIBGCC_EH),libgcc_eh.a) - TARGET_LIBGCC += $(LIBGCC_EH) -endif -endif - -KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi -KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-mips -# TODO: perhaps use $(libc_root)/kernel/uapi/asm-$(TARGET_ARCH) instead of asm-mips ? -KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) - -TARGET_C_INCLUDES := \ - $(libc_root)/arch-mips64/include \ - $(libc_root)/include \ - $(libstdc++_root)/include \ - $(KERNEL_HEADERS) \ - $(libm_root)/include \ - $(libm_root)/include/mips \ - $(libthread_db_root)/include -# TODO: perhaps use $(libm_root)/include/mips64 instead of mips ? - -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) \ - -nostdlib -Wl,-soname,$(notdir $@) \ - -Wl,--gc-sections \ - $(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \ - $(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) \ - $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ - $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ - -o $@ \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \ - $(PRIVATE_LDLIBS) -endef - -define transform-o-to-executable-inner -$(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -pie \ - -Wl,-dynamic-linker,/system/bin/linker64 \ - -Wl,--gc-sections \ - -Wl,-z,nocopyreloc \ - $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - -Wl,-rpath-link=$(PRIVATE_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) \ - $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ - $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ - -o $@ \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \ - $(PRIVATE_LDLIBS) -endef - -define transform-o-to-static-executable-inner -$(hide) $(PRIVATE_CXX) -nostdlib -Bstatic \ - -Wl,--gc-sections \ - -o $@ \ - $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_STATIC_O)) \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_ALL_OBJECTS) \ - -Wl,--whole-archive \ - $(call normalize-target-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ - -Wl,--no-whole-archive \ - $(call normalize-target-libraries,$(filter-out %libc_nomalloc.a,$(filter-out %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES)))) \ - -Wl,--start-group \ - $(call normalize-target-libraries,$(filter %libc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ - $(call normalize-target-libraries,$(filter %libc_nomalloc.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - -Wl,--end-group \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) -endef diff --git a/build/core/combo/TARGET_linux-x86.mk b/build/core/combo/TARGET_linux-x86.mk deleted file mode 100644 index f93f94a..0000000 --- a/build/core/combo/TARGET_linux-x86.mk +++ /dev/null @@ -1,231 +0,0 @@ -# -# 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 as a target. -# Included by combo/select.mk - -# Provide a default variant. -ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),) -TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := x86 -endif - -# Decouple NDK library selection with platform compiler version -$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8 - -ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) -$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8 -else -$(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_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT).mk -ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) -$(error Unknown $(TARGET_$(combo_2nd_arch_prefix)ARCH) architecture version: $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)) -endif - -include $(TARGET_ARCH_SPECIFIC_MAKEFILE) -include $(BUILD_SYSTEM)/combo/fdo.mk - -# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else -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 - -ifeq ($(TARGET_KERNEL_ARCH),x86_64) -TARGET_KERNEL_TOOLCHAIN_ROOT := prebuilts/gcc/$(HOST_PREBUILT_TAG)/host/x86_64-linux-glibc2.7-4.6 -TARGET_KERNEL_TOOLS_PREFIX := $(TARGET_KERNEL_TOOLCHAIN_ROOT)/bin/x86_64-linux- -else -TARGET_KERNEL_TOOLCHAIN_ROOT := $(TARGET_TOOLCHAIN_ROOT) -TARGET_KERNEL_TOOLS_PREFIX := $(TARGET_TOOLS_PREFIX) -endif - -ifeq ($(TARGET_BUILD_VARIANT),user) -TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip-all $< -o $@ -else -TARGET_STRIP_COMMAND = $(TARGET_STRIP) --strip-debug $< -o $@ && \ - $(TARGET_OBJCOPY) --add-gnu-debuglink=$< $@ -endif - -$(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_READELF := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)readelf$(HOST_EXECUTABLE_SUFFIX) -$(combo_2nd_arch_prefix)TARGET_STRIP := $($(combo_2nd_arch_prefix)TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX) - -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) -$(combo_2nd_arch_prefix)TARGET_LIBATOMIC := \ - $(shell $($(combo_2nd_arch_prefix)TARGET_CC) -m32 -print-file-name=libatomic.a) -endif - -$(combo_2nd_arch_prefix)TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined - -libc_root := bionic/libc -libm_root := bionic/libm -libstdc++_root := bionic/libstdc++ - -KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi -KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64. -KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) - -android_config_h := $(call select-android-config-h,target_linux-x86) - -$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ - -O2 \ - -Wa,--noexecstack \ - -Werror=format-security \ - -D_FORTIFY_SOURCE=2 \ - -Wstrict-aliasing=2 \ - -ffunction-sections \ - -finline-functions \ - -finline-limit=300 \ - -fno-short-enums \ - -fstrict-aliasing \ - -funswitch-loops \ - -funwind-tables \ - -fstack-protector \ - -m32 \ - -no-canonical-prefixes \ - -fno-canonical-system-headers \ - -include $(android_config_h) \ - -I $(dir $(android_config_h)) - -$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags) - -ifeq ($(ARCH_X86_HAVE_SSSE3),true) # yes, really SSSE3, not SSE3! - $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3 -endif -ifeq ($(ARCH_X86_HAVE_SSE4),true) - $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -msse4 -endif -ifeq ($(ARCH_X86_HAVE_SSE4_1),true) - $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -msse4.1 -endif -ifeq ($(ARCH_X86_HAVE_SSE4_2),true) - $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -msse4.2 -endif -ifeq ($(ARCH_X86_HAVE_AVX),true) - $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -mavx -endif -ifeq ($(ARCH_X86_HAVE_AES_NI),true) - $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += -maes -endif - -$(combo_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS += -m32 - -$(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 - -$(combo_2nd_arch_prefix)TARGET_C_INCLUDES := \ - $(libc_root)/arch-x86/include \ - $(libc_root)/include \ - $(libstdc++_root)/include \ - $(KERNEL_HEADERS) \ - $(libm_root)/include \ - $(libm_root)/include/i387 \ - -$(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 - -$(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 - -$(combo_2nd_arch_prefix)TARGET_STRIP_MODULE:=true - -$(combo_2nd_arch_prefix)TARGET_DEFAULT_SYSTEM_SHARED_LIBRARIES := libc libstdc++ libm - -$(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 $@) \ - $(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \ - $(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) \ - $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ - $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ - -o $@ \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \ - $(PRIVATE_LDLIBS) -endef - -define $(combo_2nd_arch_prefix)transform-o-to-executable-inner -$(hide) $(PRIVATE_CXX) \ - $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ - -nostdlib -Bdynamic \ - -Wl,-z,nocopyreloc \ - -pie \ - $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - -Wl,-rpath-link=$(PRIVATE_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) \ - $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ - $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ - -o $@ \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \ - $(PRIVATE_LDLIBS) -endef - -define $(combo_2nd_arch_prefix)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_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - -Wl,--end-group \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) -endef diff --git a/build/core/combo/TARGET_linux-x86_64.mk b/build/core/combo/TARGET_linux-x86_64.mk deleted file mode 100644 index 33d6a56..0000000 --- a/build/core/combo/TARGET_linux-x86_64.mk +++ /dev/null @@ -1,221 +0,0 @@ -# -# 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 - -# Decouple NDK library selection with platform compiler version -TARGET_NDK_GCC_VERSION := 4.8 - -ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) -TARGET_GCC_VERSION := 4.8 -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) -include $(BUILD_SYSTEM)/combo/fdo.mk - -# 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_READELF := $(TARGET_TOOLS_PREFIX)readelf$(HOST_EXECUTABLE_SUFFIX) -TARGET_STRIP := $(TARGET_TOOLS_PREFIX)strip$(HOST_EXECUTABLE_SUFFIX) - -ifneq ($(wildcard $(TARGET_CC)),) -TARGET_LIBGCC := \ - $(shell $(TARGET_CC) -m64 -print-file-name=libgcc.a) -TARGET_LIBATOMIC := \ - $(shell $(TARGET_CC) -m64 -print-file-name=libatomic.a) -endif - -TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined - -libc_root := bionic/libc -libm_root := bionic/libm -libstdc++_root := bionic/libstdc++ - -KERNEL_HEADERS_COMMON := $(libc_root)/kernel/uapi -KERNEL_HEADERS_ARCH := $(libc_root)/kernel/uapi/asm-x86 # x86 covers both x86 and x86_64. -KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) - -TARGET_GLOBAL_CFLAGS += \ - -O2 \ - -Wa,--noexecstack \ - -Werror=format-security \ - -D_FORTIFY_SOURCE=2 \ - -Wstrict-aliasing=2 \ - -ffunction-sections \ - -finline-functions \ - -finline-limit=300 \ - -fno-short-enums \ - -fstrict-aliasing \ - -funswitch-loops \ - -funwind-tables \ - -fstack-protector \ - -m64 \ - -no-canonical-prefixes \ - -fno-canonical-system-headers - -# Help catch common 32/64-bit errors. -TARGET_GLOBAL_CFLAGS += \ - -Werror=pointer-to-int-cast \ - -Werror=int-to-pointer-cast \ - -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) - -TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags) - -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 - -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,--fatal-warnings -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 \ - -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 $@) \ - $(if $(filter true,$(PRIVATE_CLANG)),-shared,-Wl,-shared) \ - $(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) \ - $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ - $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ - -o $@ \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(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,-z,nocopyreloc \ - -pie \ - $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ - -Wl,-rpath-link=$(PRIVATE_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) \ - $(if $(TARGET_BUILD_APPS),$(PRIVATE_TARGET_LIBGCC)) \ - $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ - -o $@ \ - $(PRIVATE_LDFLAGS) \ - $(PRIVATE_TARGET_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \ - $(PRIVATE_LDLIBS) -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_LIBATOMIC) \ - $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \ - -Wl,--end-group \ - $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \ - $(PRIVATE_LDLIBS) -endef diff --git a/build/core/combo/arch/arm/armv8.mk b/build/core/combo/arch/arm/armv8.mk new file mode 100644 index 0000000..c474769 --- /dev/null +++ b/build/core/combo/arch/arm/armv8.mk @@ -0,0 +1,10 @@ +# Configuration for Linux on ARM. +# Generating binaries for the ARMv5TE architecture and higher +# + +# Note: Hard coding the 'tune' value here is probably not ideal, +# and a better solution should be found in the future. +# +arch_variant_cflags := \ + -march=armv8 + diff --git a/build/core/combo/mac_version.mk b/build/core/combo/mac_version.mk deleted file mode 100644 index 6defba7..0000000 --- a/build/core/combo/mac_version.mk +++ /dev/null @@ -1,50 +0,0 @@ -# Detect Mac OS X and SDK versions. -# Output variables: -# build_mac_version -# mac_sdk_version -# mac_sdk_root -# gcc_darwin_version - -ifndef build_mac_version - -build_mac_version := $(shell sw_vers -productVersion) - -mac_sdk_versions_supported := 10.6 10.7 10.8 10.9 -ifneq ($(strip $(MAC_SDK_VERSION)),) -mac_sdk_version := $(MAC_SDK_VERSION) -ifeq ($(filter $(mac_sdk_version),$(mac_sdk_versions_supported)),) -$(warning ****************************************************************) -$(warning * MAC_SDK_VERSION $(MAC_SDK_VERSION) isn't one of the supported $(mac_sdk_versions_supported)) -$(warning ****************************************************************) -$(error Stop.) -endif -else -mac_sdk_versions_installed := $(shell xcodebuild -showsdks | grep macosx | sort | sed -e "s/.*macosx//g") -mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed), $(mac_sdk_versions_supported))) -ifeq ($(mac_sdk_version),) -mac_sdk_version := $(firstword $(mac_sdk_versions_supported)) -endif -endif - -mac_sdk_path := $(shell xcode-select -print-path) -# try /Applications/Xcode*.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.?.sdk -# or /Volume/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.?.sdk -mac_sdk_root := $(mac_sdk_path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$(mac_sdk_version).sdk -ifeq ($(wildcard $(mac_sdk_root)),) -# try legacy /Developer/SDKs/MacOSX10.?.sdk -mac_sdk_root := /Developer/SDKs/MacOSX$(mac_sdk_version).sdk -endif -ifeq ($(wildcard $(mac_sdk_root)),) -$(warning *****************************************************) -$(warning * Can not find SDK $(mac_sdk_version) at $(mac_sdk_root)) -$(warning *****************************************************) -$(error Stop.) -endif - -ifeq ($(mac_sdk_version),10.6) - gcc_darwin_version := 10 -else - gcc_darwin_version := 11 -endif - -endif # ifndef build_mac_version diff --git a/device/gigadevice/wifi-iot-cm33/BoardConfig.mk b/device/gigadevice/wifi-iot-cm33/BoardConfig.mk index b41ff3b..d8ff7e2 100644 --- a/device/gigadevice/wifi-iot-cm33/BoardConfig.mk +++ b/device/gigadevice/wifi-iot-cm33/BoardConfig.mk @@ -1,7 +1,42 @@ -# BoardConfig.mk # # Product-specific compile-time definitions. # -# same as cm33s except HAL -include device/generic/mips/BoardConfig.mk +# The generic product target doesn't have any hardware-specific pieces. +TARGET_NO_BOOTLOADER := true +TARGET_NO_KERNEL := true + +TARGET_ARCH := arm +TARGET_ARCH_VARIANT := armv8 +TARGET_CPU_ABI := arm +TARGET_CPU_SMP := false + +SMALLER_FONT_FOOTPRINT := true +MINIMAL_FONT_FOOTPRINT := true +# Some framework code requires this to enable BT +BOARD_HAVE_BLUETOOTH := true +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth + +# Build OpenGLES emulation libraries +BUILD_EMULATOR_OPENGL := true +BUILD_EMULATOR_OPENGL_DRIVER := true +USE_OPENGL_RENDERER := true +BOARD_USES_GENERIC_AUDIO := true + +USE_CAMERA_STUB := true + +BOARD_USE_LEGACY_UI := true +BOARD_EGL_CFG := device/generic/goldfish/opengl/system/egl/egl.cfg +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 786432000 +BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 +BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 +BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_FLASH_BLOCK_SIZE := 512 + +TARGET_USERIMAGES_USE_EXT4 := true +TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true + +BOARD_SEPOLICY_DIRS += \ + build/target/board/generic/sepolicy +BOARD_SEPOLICY_UNION += \ + bootanim.te diff --git a/device/gigadevice/wifi-iot-cm33/wifi_iot_cm33.mk b/device/gigadevice/wifi-iot-cm33/wifi_iot_cm33.mk index b8afa95..7802f18 100644 --- a/device/gigadevice/wifi-iot-cm33/wifi_iot_cm33.mk +++ b/device/gigadevice/wifi-iot-cm33/wifi_iot_cm33.mk @@ -12,12 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -$(call inherit-product, device/generic/mini-emulator-armv7-a-neon/mini_emulator_common.mk) - -PRODUCT_NAME := wifi_iot_cm33 +PRODUCT_NAME := wifi_iot_cm33 PRODUCT_DEVICE := wifi-iot-cm33 -PRODUCT_BRAND := Android -PRODUCT_MODEL := wifi-iot-cm33 +PRODUCT_BRAND := Rtos +PRODUCT_MODEL := wifi-iot-cm33 LOCAL_KERNEL := prebuilts/qemu-kernel/mips/kernel-qemu PRODUCT_COPY_FILES += \