[PATCH 0/2] ARM: VDSO: minor fixes for 4.1

[PATCH 0/2] ARM: VDSO: minor fixes for 4.1

[Nathan Lynch]

While investigating Arnd's v3 build issue, I became aware of a couple
of shortcomings unrelated to runtime in the VDSO code.  With these
applied, 'make arch/arm/vdso/' should behave better, and .gitignore is
populated properly (I almost always build in a separate directory, so
I hadn't noticed until now).

Nathan Lynch (2):
  ARM: VDSO: add build artifacts to .gitignore
  ARM: VDSO: honor CONFIG_VDSO in Makefile

 arch/arm/vdso/.gitignore | 2 ++
 arch/arm/vdso/Makefile   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

-- 
1.9.3

[PATCH 1/2] ARM: VDSO: add build artifacts to .gitignore

[Nathan Lynch]

vdsomunge and vdso.so.raw are outputs that don't get matched by the
normal ignore rules.

Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
---
 arch/arm/vdso/.gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/vdso/.gitignore b/arch/arm/vdso/.gitignore
index f8b69d84238e..6b47f6e0b032 100644
--- a/arch/arm/vdso/.gitignore
+++ b/arch/arm/vdso/.gitignore
@@ -1 +1,3 @@
 vdso.lds
+vdso.so.raw
+vdsomunge
-- 
1.9.3

[PATCH 2/2] ARM: VDSO: honor CONFIG_VDSO in Makefile

[Nathan Lynch]

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>
---
 arch/arm/vdso/Makefile | 4 ++--
 1 file 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
-- 
1.9.3

[PATCH 0/2] ARM: VDSO: minor fixes for 4.1

[Russell King - ARM Linux]

On Fri, Apr 17, 2015 at 04:27:02PM -0500, Nathan Lynch wrote:
> While investigating Arnd's v3 build issue, I became aware of a couple
> of shortcomings unrelated to runtime in the VDSO code.  With these
> applied, 'make arch/arm/vdso/' should behave better, and .gitignore is
> populated properly (I almost always build in a separate directory, so
> I hadn't noticed until now).

I think both of these are fine.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.