Commit 22ca7e5e authored Apr 18, 2015 by Nathan Lynch Committed by Mark Salyzyn Mar 30, 2017

UPSTREAM: ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile



(cherry pick from commit f80f6531b47c538b69769ada5e9fbacad085b34d)

When CONFIG_VDSO=n, the build normally does not enter arch/arm/vdso/
because arch/arm/Makefile does not add it to core-y.

However, if the user runs 'make arch/arm/vdso/' the VDSO targets will
get visited.  This is because the VDSO Makefile itself does not
consider the value of CONFIG_VDSO.

It is arguably better and more consistent behavior to generate an
empty built-in.o when CONFIG_VDSO=n and the user attempts to build
arch/arm/vdso/.  It's nicer because it doesn't try to build things
that Kconfig dependencies are there to prevent (e.g. the dependency on
AEABI), and it's less confusing than building objects that won't be
used in the final image.

Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Bug: 20045882
Bug: 19198045
Change-Id: I710e2ebed44ebefba5844fad13a75fc88688aa5f

parent 50997b75

arch/arm/vdso/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,8 @@ ccflags-y := -shared -fPIC -fno-common -fno-builtin -fno-stack-protector
		ccflags-y += -nostdlib -Wl,-soname=linux-vdso.so.1 -DDISABLE_BRANCH_PROFILING
		ccflags-y += -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)

		obj-y += vdso.o
		extra-y += vdso.lds
		obj-$(CONFIG_VDSO) += vdso.o
		extra-$(CONFIG_VDSO) += vdso.lds
		CPPFLAGS_vdso.lds += -P -C -U$(ARCH)

		CFLAGS_REMOVE_vdso.o = -pg