Commit 53472914 authored Sep 22, 2019 by Masahiro Yamada

sparc: vdso: fix build error of vdso32



Since commit 54b8ae66 ("kbuild: change *FLAGS_<basetarget>.o to
take the path relative to $(obj)"), sparc allmodconfig fails to build
as follows:

  CC      arch/sparc/vdso/vdso32/vclock_gettime.o
unrecognized e_machine 18 arch/sparc/vdso/vdso32/vclock_gettime.o
arch/sparc/vdso/vdso32/vclock_gettime.o: failed

The cause of the breakage is that -pg flag not being dropped.

The vdso32 files are located in the vdso32/ subdirectory, but I missed
to update the Makefile.

I removed the meaningless CFLAGS_REMOVE_vdso-note.o since it is only
effective for C file.

vdso-note.o is compiled from assembly file:

  arch/sparc/vdso/vdso-note.S
  arch/sparc/vdso/vdso32/vdso-note.S

Fixes: 54b8ae66 ("kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)")
Reported-by: Anatoly Pugachev <matorola@gmail.com>
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Anatoly Pugachev <matorola@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>

parent 31f4f5b4

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/

Admin message