Messages in this thread Patch in this message | | | From | Masahiro Yamada <> | Subject | [PATCH 4/4] x86: vdso: use CONFIG_COMPAT_32 to specify vdso32 | Date | Wed, 22 Nov 2023 08:57:01 +0900 |
| |
In arch/x86/Kconfig, COMPAT_32 is defined as (IA32_EMULATION || X86_32). Use it to eliminate redundancy in Makefile.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> ---
arch/x86/Makefile | 3 +-- arch/x86/entry/vdso/Makefile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 1a068de12a56..0899e71ddcc6 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -296,8 +296,7 @@ install: vdso-install-$(CONFIG_X86_64) += arch/x86/entry/vdso/vdso64.so.dbg vdso-install-$(CONFIG_X86_X32_ABI) += arch/x86/entry/vdso/vdsox32.so.dbg -vdso-install-$(CONFIG_X86_32) += arch/x86/entry/vdso/vdso32.so.dbg -vdso-install-$(CONFIG_IA32_EMULATION) += arch/x86/entry/vdso/vdso32.so.dbg +vdso-install-$(CONFIG_COMPAT_32) += arch/x86/entry/vdso/vdso32.so.dbg archprepare: checkbin checkbin: diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 439b52772e69..7a97b17f28b7 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -35,8 +35,7 @@ OBJECT_FILES_NON_STANDARD_extable.o := n # vDSO images to build obj-$(CONFIG_X86_64) += vdso-image-64.o obj-$(CONFIG_X86_X32_ABI) += vdso-image-x32.o -obj-$(CONFIG_X86_32) += vdso-image-32.o vdso32-setup.o -obj-$(CONFIG_IA32_EMULATION) += vdso-image-32.o vdso32-setup.o +obj-$(CONFIG_COMPAT_32) += vdso-image-32.o vdso32-setup.o OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n -- 2.40.1
| |