Commit 96b95eff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v5.4-3' of... 

Merge tag 'kbuild-fixes-v5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - fix build error when compiling SPARC VDSO with CONFIG_COMPAT=y

 - pass correct --arch option to Sparse

* tag 'kbuild-fixes-v5.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: tell sparse about the $ARCH
  sparc: vdso: fix build error of vdso32
parents 4e84608c 80591e61

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -917,6 +917,9 @@ ifeq ($(CONFIG_RELR),y) 
LDFLAGS_vmlinux	+= --pack-dyn-relocs=relr

endif



# make the checker run with the right architecture

CHECKFLAGS += --arch=$(ARCH)



# insure the checker run with the right endianness

CHECKFLAGS += $(if $(CONFIG_CPU_BIG_ENDIAN),-mbig-endian,-mlittle-endian)

arch/sparc/vdso/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -65,14 +65,14 @@ $(vobjs): KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS) $(SPARC_REG_CFLAGS 
#

# vDSO code runs in userspace and -pg doesn't help with profiling anyway.

#

CFLAGS_REMOVE_vdso-note.o = -pg

CFLAGS_REMOVE_vclock_gettime.o = -pg

CFLAGS_REMOVE_vdso32/vclock_gettime.o = -pg



$(obj)/%.so: OBJCOPYFLAGS := -S

$(obj)/%.so: $(obj)/%.so.dbg FORCE

	$(call if_changed,objcopy)



CPPFLAGS_vdso32.lds = $(CPPFLAGS_vdso.lds)

CPPFLAGS_vdso32/vdso32.lds = $(CPPFLAGS_vdso.lds)

VDSO_LDFLAGS_vdso32.lds = -m elf32_sparc -soname linux-gate.so.1



#This makes sure the $(obj) subdirectory exists even though vdso32/

CRA Git | Maintained and supported by SUSTech CRA and CCSE