diff --git a/Makefile b/Makefile
index 3acf583832ee..bb064e5e86ca 100644
--- a/Makefile
+++ b/Makefile
@@ -372,9 +372,6 @@ KBUILD_HOSTLDFLAGS  := $(HOST_LFS_LDFLAGS) $(HOSTLDFLAGS)
 KBUILD_HOSTLDLIBS   := $(HOST_LFS_LIBS) $(HOSTLDLIBS)
 
 # Make variables (CC, etc...)
-AS		= $(CROSS_COMPILE)as
-LD		= $(CROSS_COMPILE)ld
-CC		= $(CROSS_COMPILE)gcc
 CPP		= $(CC) -E
 ifneq ($(LLVM),)
 CC		= clang
@@ -387,10 +384,10 @@ READELF		= llvm-readelf
 OBJSIZE		= llvm-size
 STRIP		= llvm-strip
 else
-REAL_CC		= $(CROSS_COMPILE)gcc
+CC		= $(CROSS_COMPILE)gcc
 LD		= $(CROSS_COMPILE)ld
-AR             ?= $(CROSS_COMPILE)ar
-NM             ?= $(CROSS_COMPILE)nm
+AR		= $(CROSS_COMPILE)ar
+NM		= $(CROSS_COMPILE)nm
 OBJCOPY		= $(CROSS_COMPILE)objcopy
 OBJDUMP		= $(CROSS_COMPILE)objdump
 READELF		= $(CROSS_COMPILE)readelf
@@ -402,7 +399,7 @@ YACC		= bison
 AWK		= awk
 GENKSYMS	= scripts/genksyms/genksyms
 INSTALLKERNEL  := installkernel
-DEPMOD		= depmod
+DEPMOD		= /sbin/depmod
 PERL		= perl
 PYTHON		= python
 PYTHON2		= python2
diff --git a/arch/arm64/configs/vendor/fury-perf_defconfig b/arch/arm64/configs/vendor/fury-perf_defconfig
index a5746c464dc9..971f2eded9f7 100644
--- a/arch/arm64/configs/vendor/fury-perf_defconfig
+++ b/arch/arm64/configs/vendor/fury-perf_defconfig
@@ -31,8 +31,6 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_LZMA is not set
 # CONFIG_RD_XZ is not set
 # CONFIG_RD_LZ4 is not set
-CONFIG_LTO_GCC=y
-CONFIG_GCC_GRAPHITE=y
 CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y
 # CONFIG_UID16 is not set
 # CONFIG_FHANDLE is not set
@@ -86,6 +84,9 @@ CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_STACKPROTECTOR is not set
+CONFIG_LD_LLD=y
+CONFIG_LTO_CLANG=y
+CONFIG_LLVM_POLLY=y
 # CONFIG_VMAP_STACK is not set
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_BLK_WBT=y