Commit 1ffa9763 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/vdso' into for-next/core 

vDSO build improvements.

* for-next/vdso:
  arm64: Support running gen_vdso_offsets.sh with BSD userland.
  arm64: do not descend to vdso directories twice
parents dcabe10d f3cb097a

arch/arm64/Makefile

+6 −4
Original line number Original line Diff line number Diff line
@@ -188,10 +188,12 @@ ifeq ($(KBUILD_EXTMOD),) 
# this hack.

# this hack.

prepare: vdso_prepare

prepare: vdso_prepare

vdso_prepare: prepare0

vdso_prepare: prepare0

	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso include/generated/vdso-offsets.h

	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso \

	$(if $(CONFIG_COMPAT_VDSO),$(Q)$(MAKE) \

	include/generated/vdso-offsets.h arch/arm64/kernel/vdso/vdso.so

		$(build)=arch/arm64/kernel/vdso32  \

ifdef CONFIG_COMPAT_VDSO

		include/generated/vdso32-offsets.h)

	$(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso32 \

	include/generated/vdso32-offsets.h arch/arm64/kernel/vdso32/vdso.so

endif

endif

endif





define archhelp

define archhelp

arch/arm64/kernel/Makefile

+3 −2
Original line number Original line Diff line number Diff line
@@ -59,9 +59,10 @@ obj-$(CONFIG_CRASH_CORE) += crash_core.o 
obj-$(CONFIG_ARM_SDE_INTERFACE)		+= sdei.o

obj-$(CONFIG_ARM_SDE_INTERFACE)		+= sdei.o

obj-$(CONFIG_ARM64_PTR_AUTH)		+= pointer_auth.o

obj-$(CONFIG_ARM64_PTR_AUTH)		+= pointer_auth.o

obj-$(CONFIG_ARM64_MTE)			+= mte.o

obj-$(CONFIG_ARM64_MTE)			+= mte.o

obj-y					+= vdso-wrap.o

obj-$(CONFIG_COMPAT_VDSO)		+= vdso32-wrap.o





obj-y					+= vdso/ probes/

obj-y					+= probes/

obj-$(CONFIG_COMPAT_VDSO)		+= vdso32/

head-y					:= head.o

head-y					:= head.o

extra-y					+= $(head-y) vmlinux.lds

extra-y					+= $(head-y) vmlinux.lds

arch/arm64/kernel/vdso/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,6 @@ endif 
# Disable gcov profiling for VDSO code

# Disable gcov profiling for VDSO code

GCOV_PROFILE := n

GCOV_PROFILE := n





obj-y += vdso.o

targets += vdso.lds

targets += vdso.lds

CPPFLAGS_vdso.lds += -P -C -U$(ARCH)

CPPFLAGS_vdso.lds += -P -C -U$(ARCH)

arch/arm64/kernel/vdso/gen_vdso_offsets.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,4 +13,4 @@ 




LC_ALL=C

LC_ALL=C

sed -n -e 's/^00*/0/' -e \

sed -n -e 's/^00*/0/' -e \

's/^\([0-9a-fA-F]*\) . VDSO_\([a-zA-Z0-9_]*\)$/\#define vdso_offset_\2\t0x\1/p'
 
's/^\([0-9a-fA-F]*\) . VDSO_\([a-zA-Z0-9_]*\)$/\#define vdso_offset_\2 0x\1/p'