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

Unverified Commit ef487a71 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by derfelot
Browse files

ANDROID: CROSS_COMPILE_ARM32 must work if CONFIG_COMPAT_VDSO 



Prevent surprise loss of vdso32 support.

Signed-off-by: default avatarMark Salyzyn <salyzyn@google.com>
Bug: 63737556
Bug: 20045882
Bug: 19198045
Change-Id: I8b381f7649b95b298ea9e1a99aa3794c7bc08d09
parent 3273f31e

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ ifeq ($(CONFIG_COMPAT_VDSO), y) 
  # CONFIG_CROSS_COMPILE_ARM32, set CROSS_COMPILE_ARM32 to an appropriate value

  # when invoking make and fix CONFIG_CROSS_COMPILE_ARM32.

  ifeq ($(CROSS_COMPILE_ARM32),)

    $(warning CROSS_COMPILE_ARM32 not defined or empty, the compat vDSO will not be built)

    $(error CROSS_COMPILE_ARM32 not defined or empty, the compat vDSO will not be built)

  else ifeq ($(cc-name),clang)

    export CLANG_TRIPLE_ARM32 ?= $(CROSS_COMPILE_ARM32)

    export CLANG_TARGET_ARM32 := --target=$(notdir $(CLANG_TRIPLE_ARM32:%-=%))