mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 14:25:49 +00:00
Code Issues Releases Wiki Activity

make: combine arch-specific options together

Browse Source 
DEFINES, LDARCH, VDSO in one place - visually simpler, more terse.

Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Dmitry Safonov
2017-04-24 21:37:18 +03:00
committed by Andrei Vagin
parent 3af5fb23c4
commit 578d57fb3d
1 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Makefile
View File

@@ -35,24 +35,6 @@ endif
# #
# Architecture specific options. # Architecture specific options.
ifeq ($(ARCH),x86)
LDARCH := i386:x86-64
VDSO := y
endif
ifeq ($(ARCH),aarch64)
VDSO := y
endif
ifeq ($(ARCH),ppc64)
LDARCH := powerpc:common64
VDSO := y
endif
LDARCH ?= $(SRCARCH)
export LDARCH VDSO
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
ARMV := $(shell echo $(UNAME-M) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7') ARMV := $(shell echo $(UNAME-M) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
DEFINES := -DCONFIG_ARMV$(ARMV) DEFINES := -DCONFIG_ARMV$(ARMV)
@@ -69,17 +51,24 @@ ifeq ($(ARCH),arm)
endif endif
ifeq ($(ARCH),aarch64) ifeq ($(ARCH),aarch64)
DEFINES := -DCONFIG_AARCH64 VDSO := y
endif DEFINES := -DCONFIG_AARCH64
ifeq ($(ARCH),x86)
DEFINES := -DCONFIG_X86_64
endif endif
ifeq ($(ARCH),ppc64) ifeq ($(ARCH),ppc64)
LDARCH := powerpc:common64
VDSO := y
DEFINES := -DCONFIG_PPC64 DEFINES := -DCONFIG_PPC64
endif endif
ifeq ($(ARCH),x86)
LDARCH := i386:x86-64
VDSO := y
DEFINES := -DCONFIG_X86_64
endif
LDARCH ?= $(SRCARCH)
export LDARCH VDSO
export PROTOUFIX DEFINES USERCFLAGS export PROTOUFIX DEFINES USERCFLAGS
# #