Commit b7bcffe7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/vdso/kbuild: Group non-standard build attributes and primary object file rules together 



The fresh changes to the vDSO Makefile in:

  289d0a47 ("x86/vdso: Use CONFIG_COMPAT_32 to specify vdso32")
  329b77b5 ("x86/vdso: Simplify obj-y addition")

Conflicted with a pending change in:

  b388e57d ("x86/vdso: Fix rethunk patching for vdso-image-{32,64}.o")

Which was resolved in a simple fasion in this merge commit:

  f14df823 ("Merge branch 'x86/vdso' into x86/core, to resolve conflict and to prepare for dependent changes")

... but all these changes make me look and notice a bit of historic baggage
left in the Makefile:

  - Disordered build rules where non-standard build attributes relating to
    were placed sometimes several lines after - and sometimes *before*
    the .o build rules of the object files... Functional but inconsistent.

  - Inconsistent vertical spacing, stray whitespaces, inconsistent spelling
    of 'vDSO' over the years, a few spelling mistakes and inconsistent
    capitalization of comment blocks.

Tidy it all up. No functional changes intended.

Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f14df823

arch/x86/entry/vdso/Makefile

+15 −15
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# Building vDSO images for x86.

#



# Include the generic Makefile to check the built vdso.

# Include the generic Makefile to check the built vDSO:

include $(srctree)/lib/vdso/Makefile



# Sanitizer runtimes are unavailable and cannot be linked here.
@@ -18,28 +18,28 @@ OBJECT_FILES_NON_STANDARD := y 
# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.

KCOV_INSTRUMENT		:= n



# files to link into the vdso

# Files to link into the vDSO:

vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o

vobjs32-y := vdso32/note.o vdso32/system_call.o vdso32/sigreturn.o

vobjs32-y += vdso32/vclock_gettime.o vdso32/vgetcpu.o

vobjs-$(CONFIG_X86_SGX)	+= vsgx.o



# files to link into kernel

# Files to link into the kernel:

obj-y						+= vma.o extable.o

KASAN_SANITIZE_vma.o				:= y

UBSAN_SANITIZE_vma.o				:= y

KCSAN_SANITIZE_vma.o				:= y



OBJECT_FILES_NON_STANDARD_extable.o		:= n

OBJECT_FILES_NON_STANDARD_vdso-image-32.o 	:= n

OBJECT_FILES_NON_STANDARD_vdso-image-64.o 	:= n

OBJECT_FILES_NON_STANDARD_vma.o			:= n

OBJECT_FILES_NON_STANDARD_extable.o		:= n



# vDSO images to build

# vDSO images to build:

obj-$(CONFIG_X86_64)				+= vdso-image-64.o

obj-$(CONFIG_X86_X32_ABI)			+= vdso-image-x32.o

obj-$(CONFIG_COMPAT_32)				+= vdso-image-32.o vdso32-setup.o



OBJECT_FILES_NON_STANDARD_vdso-image-32.o	:= n

OBJECT_FILES_NON_STANDARD_vdso-image-64.o	:= n

OBJECT_FILES_NON_STANDARD_vdso32-setup.o	:= n



vobjs := $(addprefix $(obj)/, $(vobjs-y))