mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -04:00
693c819fed
- Separate out the vdso sources into common, vdso32, and vdso64 directories. - Build the 32- and 64-bit vdsos in their respective subdirectories; this greatly simplifies the build flags handling. - Unify the mangling of Makefile flags between the 32- and 64-bit vdso code as much as possible; all common rules are put in arch/x86/entry/vdso/common/Makefile.include. The remaining is very simple for 32 bits; the 64-bit one is only slightly more complicated because it contains the x32 generation rule. - Define __DISABLE_EXPORTS when building the vdso. This need seems to have been masked by different ordering compile flags before. - Change CONFIG_X86_64 to BUILD_VDSO32_64 in vdso32/system_call.S, to make it compatible with including fake_32bit_build.h. - The -fcf-protection= option was "leaking" from the kernel build, for reasons that was not clear to me. Furthermore, several distributions ship with it set to a default value other than "-fcf-protection=none". Make it match the configuration options for *user space*. Note that this patch may seem large, but the vast majority of it is simply code movement. Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Link: https://patch.msgid.link/20251216212606.1325678-4-hpa@zytor.com
47 lines
1.3 KiB
Makefile
47 lines
1.3 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# 64-bit vDSO images for x86.
|
|
#
|
|
|
|
# The vDSOs built in this directory
|
|
vdsos-y := 64
|
|
vdsos-$(CONFIG_X86_X32_ABI) += x32
|
|
|
|
# Files to link into the vDSO:
|
|
vobjs-y := note.o vclock_gettime.o vgetcpu.o
|
|
vobjs-y += vgetrandom.o vgetrandom-chacha.o
|
|
vobjs-$(CONFIG_X86_SGX) += vsgx.o
|
|
|
|
# Compilation flags
|
|
flags-y := -DBUILD_VDSO64 -m64 -mcmodel=small
|
|
|
|
# The location of this include matters!
|
|
include $(src)/../common/Makefile.include
|
|
|
|
#
|
|
# X32 processes use x32 vDSO to access 64bit kernel data.
|
|
#
|
|
# Build x32 vDSO image:
|
|
# 1. Compile x32 vDSO as 64bit.
|
|
# 2. Convert object files to x32.
|
|
# 3. Build x32 VDSO image with x32 objects, which contains 64bit codes
|
|
# so that it can reach 64bit address space with 64bit pointers.
|
|
#
|
|
|
|
# Convert 64bit object file to x32 for x32 vDSO.
|
|
quiet_cmd_x32 = X32 $@
|
|
cmd_x32 = $(OBJCOPY) -O elf32-x86-64 $< $@
|
|
|
|
$(obj)/%-x32.o: $(obj)/%.o FORCE
|
|
$(call if_changed,x32)
|
|
|
|
vobjsx32 = $(patsubst %.o,%-x32.o,$(vobjs))
|
|
targets += $(patsubst %.o,%-x32.o,$(vobjs-y))
|
|
|
|
# Linker options for the vdso
|
|
VDSO_LDFLAGS_64 := -m elf_x86_64 -soname linux-vdso.so.1 -z max-page-size=4096
|
|
VDSO_LDFLAGS_x32 := $(subst elf_x86_64,elf32_x86_64,$(VDSO_LDFLAGS_64))
|
|
|
|
$(obj)/vdso64.so.dbg: $(vobjs)
|
|
$(obj)/vdsox32.so.dbg: $(vobjsx32)
|