diff options
| author | Nathan Lynch <nathan_lynch@mentor.com> | 2015-04-18 01:39:16 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-04-21 16:28:02 +0200 |
| commit | f80f6531b47c538b69769ada5e9fbacad085b34d (patch) | |
| tree | 9bb3174c477c99a575e4d73bf91816ce4f8a47d7 /arch/arm | |
| parent | ARM: 8343/1: VDSO: add build artifacts to .gitignore (diff) | |
| download | linux-f80f6531b47c538b69769ada5e9fbacad085b34d.tar.xz linux-f80f6531b47c538b69769ada5e9fbacad085b34d.zip | |
ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/vdso/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile index bab0a8be7924..8aa791051029 100644 --- a/arch/arm/vdso/Makefile +++ b/arch/arm/vdso/Makefile @@ -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 |