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

Commit f5af850a authored by Isaac Chen's avatar Isaac Chen
Browse files

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

This reverts commit 7de79cbe.

Fixed CTS build issue by adding -march=armv7-a in cts/tests/tests/os/jni/Android.mk since the library built here needs/uses instruction (swp) obsolete in ARMv8.

Bug: 64964151
Test: lunch aosp_arm64-userdebug; make -j cts
      lunch aosp_x86-userdebug; make -j cts
      lunch aosp_sailfish-userdebug; make -j cts
      lunch aosp_bullhead-userdebug; make -j cts

Change-Id: Ic3a121600da8e2a9a2d5176b9680cd18ce457959
parent 7de79cbe

core/combo/TARGET_linux-arm.mk

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

# 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)),)

TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te

endif

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

0 → 100644
+9 −0
Original line number 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 Diff line number Diff line
@@ -35,11 +35,11 @@ ifneq ($(TARGET_BUILD_APPS)$(filter cts,$(MAKECMDGOALS)),) 
# platforms.

#

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

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

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

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

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

#

# TARGET_2ND_ARCH_VARIANT := armv7-a-neon

# TARGET_2ND_CPU_VARIANT := cortex-a15

# TARGET_2ND_ARCH_VARIANT := armv8-a

# TARGET_2ND_CPU_VARIANT := generic

#

# DO NOT USE

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

# DO NOT USE

else

TARGET_2ND_ARCH_VARIANT := armv7-a-neon

TARGET_2ND_CPU_VARIANT := cortex-a15

TARGET_2ND_ARCH_VARIANT := armv8-a

TARGET_2ND_CPU_VARIANT := generic

endif