Skip to content

Commit 3dce917

Browse files
committed
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>
1 parent ba56cdf commit 3dce917

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

arch/parisc/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,12 @@ prepare: vdso_prepare
176176
vdso_prepare: prepare0
177177
$(if $(CONFIG_64BIT),$(Q)$(MAKE) \
178178
$(build)=arch/parisc/kernel/vdso64 include/generated/vdso64-offsets.h)
179-
$(Q)$(MAKE) $(build)=arch/parisc/kernel/vdso32 include/generated/vdso32-offsets.h
179+
$(if $(CONFIG_PA11)$(CONFIG_COMPAT),$(Q)$(MAKE) \
180+
$(build)=arch/parisc/kernel/vdso32 include/generated/vdso32-offsets.h)
180181
endif
181182

182-
vdso-install-y += arch/parisc/kernel/vdso32/vdso32.so
183+
vdso-install-$(CONFIG_PA11) += arch/parisc/kernel/vdso32/vdso32.so
184+
vdso-install-$(CONFIG_COMPAT) += arch/parisc/kernel/vdso32/vdso32.so
183185
vdso-install-$(CONFIG_64BIT) += arch/parisc/kernel/vdso64/vdso64.so
184186

185187
install: KBUILD_IMAGE := vmlinux

arch/parisc/kernel/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ obj-$(CONFIG_KEXEC_FILE) += kexec_file.o
4747
# vdso
4848
obj-y += vdso.o
4949
obj-$(CONFIG_64BIT) += vdso64/
50-
obj-y += vdso32/
50+
obj-$(CONFIG_PA11) += vdso32/
51+
obj-$(CONFIG_COMPAT) += vdso32/

0 commit comments

Comments
 (0)