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

Commit 7de79cbe authored by Tobias Thierer's avatar Tobias Thierer
Browse files

Revert "Build support for 32-bit armv8-a" 

This reverts commit 0daa78ee.

Reason for revert: Broke the build for some targets (including marlin and angler).

$ make cts
build/core/combo/TARGET_linux-arm.mk:43: kryo is armv8-a.
build/core/combo/TARGET_linux-arm.mk:45: TARGET_2ND_ARCH_VARIANT, armv7-a-neon, ignored! Use armv8-a instead.
[...]
cts/tests/tests/os/jni/android_os_cts_CpuInstructions.cpp:88:20: error: instruction requires: armv7 or earlier
    asm volatile ( "swp r0, r0, [%0]" : "+r"(ptr) : : "r0" );
                   ^
<inline asm>:1:2: note: instantiated into assembly here
        swp r0, r0, [r1]
        ^

Change-Id: I65a91ed5a4461eca6646df13642a87a5c37d6c85
parent 0daa78ee

core/combo/TARGET_linux-arm.mk

+0 −20
Original line number Original line Diff line number Diff line
@@ -29,26 +29,6 @@ 
# include defines, and compiler settings for the given architecture

# include defines, and compiler settings for the given architecture

# version.

# version.

#

#

ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)),)

TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT := generic

endif



KNOWN_ARMv8_CORES := cortex-a53 cortex-a53.a57 cortex-a73

KNOWN_ARMv8_CORES += kryo denver64 exynos-m1 exynos-m2



# Many devices (incorrectly) use armv7-a-neon as the 2nd architecture variant

# for cores that implement armv8-a ISAs. The following sets it to armv8-a.

ifneq (,$(filter $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT), $(KNOWN_ARMv8_CORES)))

  ifneq ($(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT),armv8-a)

    $(warning $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT) is armv8-a.)

    ifneq (,$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT))

      $(warning TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT, $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT), ignored! Use armv8-a instead.)

    endif

    # Overwrite TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT

    TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv8-a

  endif

endif



ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),)

ifeq ($(strip $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT)),)

TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te

TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te

endif

endif

core/combo/arch/arm/armv8-a.mk

deleted100644 → 0
+0 −9
Original line number Original line Diff line number Diff line 
# Configuration for Linux on ARM.

# Generating binaries for the ARMv8-a architecture

#

# Many libraries are not aware of armv8-a, and AArch32 is (almost) a superset

# of armv7-a-neon. So just let them think we are just like v7.

ARCH_ARM_HAVE_ARMV7A            := true

ARCH_ARM_HAVE_VFP               := true

ARCH_ARM_HAVE_VFP_D32           := true

ARCH_ARM_HAVE_NEON              := true

target/board/generic_arm64/BoardConfig.mk

+6 −6
Original line number Original line Diff line number Diff line
@@ -35,11 +35,11 @@ ifneq ($(TARGET_BUILD_APPS)$(filter cts,$(MAKECMDGOALS)),) 
# platforms.

# platforms.

#

#

# If you're building a 64 bit platform (and not an application) the

# If you're building a 64 bit platform (and not an application) the

# ARM-v8 specification allows you to assume all the features available in an

# ARM-v8 specification allows you to assume NEON and all the features

# armv7-a-neon CPU. You should set the following as 2nd arch/cpu variant:

# available in a cortex-A15 CPU. You should be able to set :

#

#

# TARGET_2ND_ARCH_VARIANT := armv8-a

# TARGET_2ND_ARCH_VARIANT := armv7-a-neon

# TARGET_2ND_CPU_VARIANT := generic

# TARGET_2ND_CPU_VARIANT := cortex-a15

#

#

# DO NOT USE

# DO NOT USE

# DO NOT USE

# DO NOT USE
@@ -50,8 +50,8 @@ TARGET_2ND_CPU_VARIANT := generic 
# DO NOT USE

# DO NOT USE

# DO NOT USE

# DO NOT USE

else

else

TARGET_2ND_ARCH_VARIANT := armv8-a

TARGET_2ND_ARCH_VARIANT := armv7-a-neon

TARGET_2ND_CPU_VARIANT := generic

TARGET_2ND_CPU_VARIANT := cortex-a15

endif

endif