Skip to content

Commit

Permalink
Revert "ANDROID: Kbuild, LLVMLinux: allow overriding clang target tri…
Browse files Browse the repository at this point in the history
…ple"

This reverts commit cb01416

AOSP's distribution of GNU binutils always had a curious target triple
prefix on the binaries.  Now that GNU binutils is deprecated for Android
Common Kernels, we can now remove this out of tree workaround. Now
building Android kernels with LLVM matches upstream (see
Documentation/kbuild/llvm.rst).

Bug: 118439987
Bug: 120440614
Bug: 141693040
Signed-off-by: Nick Desaulniers <[email protected]>
Change-Id: Iecaa3264a440f795f2f3a44bdf74fe28ad4ed1cc
nickdesaulniers authored and Linux4 committed Dec 2, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 74c2327 commit 7a3f8b2
Showing 4 changed files with 3 additions and 13 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -526,11 +526,7 @@ endif

ifeq ($(cc-name),clang)
ifneq ($(CROSS_COMPILE),)
CLANG_TRIPLE ?= $(CROSS_COMPILE)
CLANG_FLAGS += --target=$(notdir $(CLANG_TRIPLE:%-=%))
ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
endif
CLANG_FLAGS += --target=$(notdir $(CROSS_COMPILE:%-=%))
GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
3 changes: 1 addition & 2 deletions build.config.aarch64
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ARCH=arm64

CLANG_TRIPLE=aarch64-linux-gnu-
CROSS_COMPILE=aarch64-linux-androidkernel-
CROSS_COMPILE=aarch64-linux-gnu-
LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin

FILES="
3 changes: 1 addition & 2 deletions build.config.x86_64
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ARCH=x86_64

CLANG_TRIPLE=x86_64-linux-gnu-
CROSS_COMPILE=x86_64-linux-androidkernel-
CROSS_COMPILE=x86_64-linux-gnu-
LINUX_GCC_CROSS_COMPILE_PREBUILTS_BIN=prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin

FILES="
4 changes: 0 additions & 4 deletions scripts/clang-android.sh

This file was deleted.

0 comments on commit 7a3f8b2

Please sign in to comment.