From 35d296a02d0d97b9228bfd8f3337246f27e862b6 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Wed, 29 Dec 2021 14:05:30 -0800 Subject: [PATCH] ANDROID: remove stale variables from build.config files There is no need for CROSS_COMPILE_COMPAT as of v5.16-rc1 via commit 3e6f8d1fa184 ("arm64: vdso32: require CROSS_COMPILE_COMPAT for gcc+bfd") when LLVM=1 is set. This was backported to v5.10.89. LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN was a temporary dependency until LLVM_IAS=1 was enabled for all architectures. With LLVM_IAS=1 (implied by LLVM=1), nothing in this directory is used and the variable can be removed. It doesn't hurt to respecify any of the above, but they are no longer necessary. We may be able to further simplify the usage of LLVM_IAS=1 and CROSS_COMPILE in android13-5.10 depending on whether the following get backported in the future: commit f12b034afeb3 ("scripts/Makefile.clang: default to LLVM_IAS=1"). commit 231ad7f409f1 ("Makefile: infer --target from ARCH for CC=clang") Bug: 209655537 Signed-off-by: Nick Desaulniers Change-Id: I361b05ea9f36da933e6712150650f476b093d0a7 --- build.config.aarch64 | 4 ---- build.config.arm | 2 -- build.config.x86_64 | 2 -- 3 files changed, 8 deletions(-) diff --git a/build.config.aarch64 b/build.config.aarch64 index 50523ac0774c..df8f76ab272c 100644 --- a/build.config.aarch64 +++ b/build.config.aarch64 @@ -1,10 +1,6 @@ ARCH=arm64 - LLVM_IAS=1 CROSS_COMPILE=aarch64-linux-gnu- -CROSS_COMPILE_COMPAT=arm-linux-gnueabi- -LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gas/linux-x86 -LINUX_GCC_CROSS_COMPILE_COMPAT_PREBUILTS_BIN=prebuilts/gas/linux-x86 FILES=" arch/arm64/boot/Image.gz diff --git a/build.config.arm b/build.config.arm index 480f80079b98..dce13076dfcb 100644 --- a/build.config.arm +++ b/build.config.arm @@ -1,8 +1,6 @@ ARCH=arm - LLVM_IAS=1 CROSS_COMPILE=arm-linux-gnueabi- -LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gas/linux-x86 FILES=" arch/arm/boot/Image.gz diff --git a/build.config.x86_64 b/build.config.x86_64 index db5ed3a5f977..cfbee0c5f881 100644 --- a/build.config.x86_64 +++ b/build.config.x86_64 @@ -1,8 +1,6 @@ ARCH=x86_64 - LLVM_IAS=1 CROSS_COMPILE=x86_64-linux-gnu- -LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gas/linux-x86 FILES=" arch/x86/boot/bzImage