Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d503ac53 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: rename LDFLAGS to KBUILD_LDFLAGS 



Commit a0f97e06 ("kbuild: enable 'make CFLAGS=...' to add
additional options to CC") renamed CFLAGS to KBUILD_CFLAGS.

Commit 222d394d ("kbuild: enable 'make AFLAGS=...' to add
additional options to AS") renamed AFLAGS to KBUILD_AFLAGS.

Commit 06c5040c ("kbuild: enable 'make CPPFLAGS=...' to add
additional options to CPP") renamed CPPFLAGS to KBUILD_CPPFLAGS.

For some reason, LDFLAGS was not renamed.

Using a well-known variable like LDFLAGS may result in accidental
override of the variable.

Kbuild generally uses KBUILD_ prefixed variables for the internally
appended options, so here is one more conversion to sanitize the
naming convention.

I did not touch Makefiles under tools/ since the tools build system
is a different world.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent 87a32e62

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ KBUILD_CFLAGS_KERNEL := 
KBUILD_AFLAGS_MODULE  := -DMODULE

KBUILD_CFLAGS_MODULE  := -DMODULE

KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds

LDFLAGS :=

KBUILD_LDFLAGS :=

GCC_PLUGINS_CFLAGS :=



export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
@@ -448,7 +448,7 @@ export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS 
export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE

export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS



export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS

export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS

export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE

export CFLAGS_KASAN CFLAGS_KASAN_NOSANITIZE CFLAGS_UBSAN

export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
@@ -1020,7 +1020,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink) 


# Final link of vmlinux with optional arch pass after final link

cmd_link-vmlinux =                                                 \

	$(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) ;    \

	$(CONFIG_SHELL) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ;    \

	$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)



vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE

arch/arc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ KBUILD_CFLAGS_MODULE += -mlong-calls -mno-millicode 
# Finally dump eveything into kernel build system

KBUILD_CFLAGS	+= $(cflags-y)

KBUILD_AFLAGS	+= $(KBUILD_CFLAGS)

LDFLAGS		+= $(ldflags-y)

KBUILD_LDFLAGS	+= $(ldflags-y)



head-y		:= arch/arc/kernel/head.o

arch/arm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ ifeq ($(CONFIG_CPU_BIG_ENDIAN),y) 
KBUILD_CPPFLAGS	+= -mbig-endian

CHECKFLAGS	+= -D__ARMEB__

AS		+= -EB

LDFLAGS		+= -EB

KBUILD_LDFLAGS	+= -EB

else

KBUILD_CPPFLAGS	+= -mlittle-endian

CHECKFLAGS	+= -D__ARMEL__

AS		+= -EL

LDFLAGS		+= -EL

KBUILD_LDFLAGS	+= -EL

endif



#

arch/arm64/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -62,14 +62,14 @@ CHECKFLAGS += -D__AARCH64EB__ 
AS		+= -EB

# Prefer the baremetal ELF build target, but not all toolchains include

# it so fall back to the standard linux version if needed.

LDFLAGS		+= -EB $(call ld-option, -maarch64elfb, -maarch64linuxb)

KBUILD_LDFLAGS	+= -EB $(call ld-option, -maarch64elfb, -maarch64linuxb)

UTS_MACHINE	:= aarch64_be

else

KBUILD_CPPFLAGS	+= -mlittle-endian

CHECKFLAGS	+= -D__AARCH64EL__

AS		+= -EL

# Same as above, prefer ELF but fall back to linux target if needed.

LDFLAGS		+= -EL $(call ld-option, -maarch64elf, -maarch64linux)

KBUILD_LDFLAGS	+= -EL $(call ld-option, -maarch64elf, -maarch64linux)

UTS_MACHINE	:= aarch64

endif

arch/c6x/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ ifdef CONFIG_CPU_BIG_ENDIAN 
KBUILD_CFLAGS   += -mbig-endian

KBUILD_AFLAGS   += -mbig-endian

LINKFLAGS       += -mbig-endian

KBUILD_LDFLAGS  += -mbig-endian

LDFLAGS += -EB

KBUILD_LDFLAGS  += -mbig-endian -EB

CHECKFLAGS	+= -D_BIG_ENDIAN

endif