Skip to contentSkip to conversation

parisc: Allow to build without vdso32

PATCH New Helge Deller 1 participant 1 message Apr 8 PA-RISC architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 parisc: Allow to build without vdso32

From: Helge Deller <[email protected]>

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

---
 arch/parisc/Makefile        | 6 ++++--
 arch/parisc/kernel/Makefile | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)
arch/parisc/Makefile +4 -2
index 48ae3c79557a..edab2a948352 100644
@@ -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
arch/parisc/kernel/Makefile +2 -1
index 9157bc8bdf41..2f3441769ac5 100644
@@ -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/
Signature · 1 line
2.53.0