Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile: Compatibility update for Clang #3101

Closed
wants to merge 1 commit into from
Closed

Makefile: Compatibility update for Clang #3101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,9 @@ ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
endif
GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE)) # In Clang version 12 and up, there has been a change in Clang's handling of cross-compiling
# and since then, when specifying a Clang-based toolchain, it will output an error which states that "-EL"
# is unsupported. fix from kdrag0n/proton-clang readme
GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
endif
ifneq ($(GCC_TOOLCHAIN),)
Expand Down Expand Up @@ -686,6 +688,15 @@ else
KBUILD_CFLAGS += -O2
endif

# -fstack-protector compatibility when building with Clang-based toolchains. fix from kdrag0n/proton-clang readme
# May have some potential performance gains for dedicated architecture optimization flags.
ifeq ($(cc-name),gcc)
KBUILD_CFLAGS += -mcpu=cortex-a75.cortex-a55 -mtune=cortex-a75.cortex-a55
endif
ifeq ($(cc-name),clang)
KBUILD_CFLAGS += -mcpu=cortex-a55 -mtune=cortex-a55
endif

# Tell gcc to never replace conditional load with a non-conditional one
KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
KBUILD_CFLAGS += $(call cc-option,-fno-allow-store-data-races)
Expand Down