parisc: Allow to build without VDSO32

When building for 64-bit and without CONFIG_COMPAT, leave out the
vdso32 binary.

Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 48ae3c79557a51d7fb5189a97ea4a28608c3d775..edab2a94835255f64f3f0cf8d5924d1b687f0adb 100644 (file)
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -176,10 +176,12 @@ prepare: vdso_prepare
 vdso_prepare: prepare0
        $(if $(CONFIG_64BIT),$(Q)$(MAKE) \
                $(build)=arch/parisc/kernel/vdso64 include/generated/vdso64-offsets.h)
-       $(Q)$(MAKE) $(build)=arch/parisc/kernel/vdso32 include/generated/vdso32-offsets.h
+       $(if $(CONFIG_PA11)$(CONFIG_COMPAT),$(Q)$(MAKE) \
+               $(build)=arch/parisc/kernel/vdso32 include/generated/vdso32-offsets.h)
 endif
 
-vdso-install-y                 += arch/parisc/kernel/vdso32/vdso32.so
+vdso-install-$(CONFIG_PA11)    += arch/parisc/kernel/vdso32/vdso32.so
+vdso-install-$(CONFIG_COMPAT)  += arch/parisc/kernel/vdso32/vdso32.so
 vdso-install-$(CONFIG_64BIT)   += arch/parisc/kernel/vdso64/vdso64.so
 
 install: KBUILD_IMAGE := vmlinux

diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile
index 9157bc8bdf41cbf41a33b09646199743c1e376ab..2f3441769ac543f35eff85e203e16a343a2bf22c 100644 (file)
--- a/arch/parisc/kernel/Makefile
+++ b/arch/parisc/kernel/Makefile
@@ -47,4 +47,5 @@ obj-$(CONFIG_KEXEC_FILE)              += kexec_file.o
 # vdso
 obj-y                  += vdso.o
 obj-$(CONFIG_64BIT)    += vdso64/
-obj-y                  += vdso32/
+obj-$(CONFIG_PA11)     += vdso32/
+obj-$(CONFIG_COMPAT)   += vdso32/