Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64566d92 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Delete arch variant makefiles." into main

parents b24633b0 0783d7b1

core/combo/TARGET_linux-arm.mk

+4 −6
Original line number Diff line number Diff line
@@ -58,12 +58,10 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),) 
  $(error TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT must be set)

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 ARM architecture version: $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT))

endif



include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

# NEON is mandatory, see: https://developer.android.com/ndk/guides/abis#v7a

ARCH_ARM_HAVE_VFP               := true

ARCH_ARM_HAVE_VFP_D32           := true

ARCH_ARM_HAVE_NEON              := true



define $(combo_var_prefix)transform-shared-lib-to-toc

$(call _gen_toc_command_for_elf,$(1),$(2))

core/combo/TARGET_linux-arm64.mk

+0 −7
Original line number Diff line number Diff line
@@ -33,13 +33,6 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) 
TARGET_ARCH_VARIANT := armv8

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)



define $(combo_var_prefix)transform-shared-lib-to-toc

$(call _gen_toc_command_for_elf,$(1),$(2))

endef

core/combo/TARGET_linux-riscv64.mk

+0 −11
Original line number Diff line number Diff line
@@ -22,17 +22,6 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) 
TARGET_ARCH_VARIANT := riscv64

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)



define $(combo_var_prefix)transform-shared-lib-to-toc

$(call _gen_toc_command_for_elf,$(1),$(2))

endef

core/combo/TARGET_linux-x86.mk

+0 −11
Original line number Diff line number Diff line
@@ -22,17 +22,6 @@ ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),) 
TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := x86

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)



define $(combo_var_prefix)transform-shared-lib-to-toc

$(call _gen_toc_command_for_elf,$(1),$(2))

endef

core/combo/TARGET_linux-x86_64.mk

+0 −11
Original line number Diff line number Diff line
@@ -22,17 +22,6 @@ ifeq ($(strip $(TARGET_ARCH_VARIANT)),) 
TARGET_ARCH_VARIANT := x86_64

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)



define $(combo_var_prefix)transform-shared-lib-to-toc

$(call _gen_toc_command_for_elf,$(1),$(2))

endef