ANDROID: CROSS_COMPILE_ARM32 must work if CONFIG_COMPAT_VDSO
authorMark Salyzyn <salyzyn@google.com>
Tue, 28 Mar 2017 21:11:02 +0000 (14:11 -0700)
committerMichael Benedict <michaelbt@live.com>
Sun, 22 Sep 2019 15:52:43 +0000 (01:52 +1000)
Prevent surprise loss of vdso32 support.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 63737556
Bug: 20045882
Bug: 19198045
Change-Id: I8b381f7649b95b298ea9e1a99aa3794c7bc08d09

arch/arm64/Makefile

index 4239853dd16c32cdf54e44f939c5988a07da2e43..5705c761e0ca0ad04fb735341e84d62221b5f116 100644 (file)
@@ -48,7 +48,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:%-=%))