mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 09:58:09 +00:00
Code Issues Releases Wiki Activity

build: Remove SRCARCH

Browse Source 
SRCARCH is always equal ARCH. There are no rules when to use one or
another and architectures may forget to set one of them up.

No need for a second variable meaning the same and confusing people.
Remove it completely.

Self-correction [after some debug]: SRCARCH was different in one place:
zdtm Makefile by some unintentional mistake:
> ifeq ($(ARCH),arm64)
>         ARCH		?= aarch64
>         SRCARCH	?= aarch64
> endif

That meant to be "ARCH := aarch64" because "?=" would never work inside
that ifeq. Fix up this part of mess too.

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
This commit is contained in:
Dmitry Safonov 2019-11-21 21:56:34 +00:00 committed by Andrei Vagin
parent 60bb5c7310
commit 25f6d4f72f
8 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -86,7 +86,6 @@ endif
# commit "S/390: Fix 64 bit sibcall". # commit "S/390: Fix 64 bit sibcall".
ifeq ($(ARCH),s390) ifeq ($(ARCH),s390)
ARCH := s390 ARCH := s390
SRCARCH := s390
DEFINES := -DCONFIG_S390 DEFINES := -DCONFIG_S390
CFLAGS_PIE := -fno-optimize-sibling-calls CFLAGS_PIE := -fno-optimize-sibling-calls
endif endif
@ -94,7 +93,7 @@ endif
CFLAGS_PIE += -DCR_NOGLIBC CFLAGS_PIE += -DCR_NOGLIBC
export CFLAGS_PIE export CFLAGS_PIE
LDARCH ?= $(SRCARCH) LDARCH ?= $(ARCH)
export LDARCH export LDARCH
export PROTOUFIX DEFINES export PROTOUFIX DEFINES

2
Makefile.config
View File

@ -30,7 +30,7 @@ CONFIG_FILE = .config
$(CONFIG_FILE): $(CONFIG_FILE):
touch $(CONFIG_FILE) touch $(CONFIG_FILE)
ifeq ($(SRCARCH),x86) ifeq ($(ARCH),x86)
# CONFIG_COMPAT is only for x86 now, no need for compile-test other archs # CONFIG_COMPAT is only for x86 now, no need for compile-test other archs
ifeq ($(call try-asm,$(FEATURE_TEST_X86_COMPAT)),true) ifeq ($(call try-asm,$(FEATURE_TEST_X86_COMPAT)),true)
export CONFIG_COMPAT := y export CONFIG_COMPAT := y

4
compel/plugins/Makefile
View File

@ -53,11 +53,11 @@ std-lib-y += ./$(PLUGIN_ARCH_DIR)/std/parasite-head.o
target += fds target += fds
fds-lib-y += fds/fds.o fds-lib-y += fds/fds.o
ifeq ($(SRCARCH),x86) ifeq ($(ARCH),x86)
std-lib-y += ./$(PLUGIN_ARCH_DIR)/std/memcpy.o std-lib-y += ./$(PLUGIN_ARCH_DIR)/std/memcpy.o
endif endif
ifeq ($(SRCARCH),ppc64) ifeq ($(ARCH),ppc64)
std-lib-y += ./$(PLUGIN_ARCH_DIR)/std/memcpy.o std-lib-y += ./$(PLUGIN_ARCH_DIR)/std/memcpy.o
std-lib-y += ./$(PLUGIN_ARCH_DIR)/std/memcmp.o std-lib-y += ./$(PLUGIN_ARCH_DIR)/std/memcmp.o
endif endif

2
criu/Makefile
View File

@ -2,7 +2,7 @@
# 6a8d90f5fec4 "attr: Allow attribute type 0" # 6a8d90f5fec4 "attr: Allow attribute type 0"
WRAPFLAGS += -Wl,--wrap=nla_parse,--wrap=nlmsg_parse WRAPFLAGS += -Wl,--wrap=nla_parse,--wrap=nlmsg_parse
ARCH_DIR := criu/arch/$(SRCARCH) ARCH_DIR := criu/arch/$(ARCH)
PIE_DIR := criu/pie PIE_DIR := criu/pie
export ARCH_DIR PIE_DIR export ARCH_DIR PIE_DIR

6
criu/pie/Makefile
View File

@ -14,7 +14,7 @@ ifneq ($(filter-out clean mrproper,$(MAKECMDGOALS)),)
compel_plugins := $(shell $(COMPEL_BIN) plugins) compel_plugins := $(shell $(COMPEL_BIN) plugins)
endif endif
LDS := compel/arch/$(SRCARCH)/scripts/compel-pack.lds.S LDS := compel/arch/$(ARCH)/scripts/compel-pack.lds.S
restorer-obj-y += parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o restorer-obj-y += parasite-vdso.o ./$(ARCH_DIR)/vdso-pie.o
restorer-obj-y += ./$(ARCH_DIR)/restorer.o restorer-obj-y += ./$(ARCH_DIR)/restorer.o
@ -26,11 +26,11 @@ ifeq ($(ARCH),x86)
endif endif
endif endif
ifeq ($(SRCARCH),aarch64) ifeq ($(ARCH),aarch64)
restorer-obj-y += ./$(ARCH_DIR)/intraprocedure.o restorer-obj-y += ./$(ARCH_DIR)/intraprocedure.o
endif endif
ifeq ($(SRCARCH),ppc64) ifeq ($(ARCH),ppc64)
restorer-obj-y += ./$(ARCH_DIR)/vdso-trampoline.o restorer-obj-y += ./$(ARCH_DIR)/vdso-trampoline.o
endif endif

4
criu/pie/Makefile.library
View File

@ -9,14 +9,14 @@ lib-name := pie.lib.a
lib-y += util.o lib-y += util.o
lib-y += util-vdso.o lib-y += util-vdso.o
ifeq ($(SRCARCH),x86) ifeq ($(ARCH),x86)
ifeq ($(CONFIG_COMPAT),y) ifeq ($(CONFIG_COMPAT),y)
lib-y += util-vdso-elf32.o lib-y += util-vdso-elf32.o
endif endif
CFLAGS_util-vdso-elf32.o += -DCONFIG_VDSO_32 CFLAGS_util-vdso-elf32.o += -DCONFIG_VDSO_32
endif endif
ifeq ($(SRCARCH),arm) ifeq ($(ARCH),arm)
lib-y += ./$(ARCH_DIR)/aeabi-helpers.o lib-y += ./$(ARCH_DIR)/aeabi-helpers.o
lib-y += ./$(ARCH_DIR)/pie-cacheflush.o lib-y += ./$(ARCH_DIR)/pie-cacheflush.o
endif endif

7
test/zdtm/Makefile.inc
View File

@ -15,12 +15,9 @@ ARCH ?= $(shell uname -m | sed \
-e s/aarch64.*/arm64/) -e s/aarch64.*/arm64/)
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
ARCH ?= aarch64 ARCH := aarch64
SRCARCH ?= aarch64
endif endif
SRCARCH ?= $(ARCH)
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')
@ -35,7 +32,7 @@ CC := gcc
CFLAGS += -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 CFLAGS += -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
CFLAGS += $(USERCFLAGS) CFLAGS += $(USERCFLAGS)
CFLAGS += -D_GNU_SOURCE CFLAGS += -D_GNU_SOURCE
CPPFLAGS += -iquote $(LIBDIR)/arch/$(SRCARCH)/include CPPFLAGS += -iquote $(LIBDIR)/arch/$(ARCH)/include
ifeq ($(strip $(V)),) ifeq ($(strip $(V)),)
E = @echo E = @echo

4
test/zdtm/static/Makefile
View File

@ -219,13 +219,13 @@ TST_NOFILE := \
child_subreaper_and_reparent \ child_subreaper_and_reparent \
# jobctl00 \ # jobctl00 \
ifneq ($(SRCARCH),arm) ifneq ($(ARCH),arm)
ifneq ($(COMPAT_TEST),y) ifneq ($(COMPAT_TEST),y)
TST_NOFILE += maps03 TST_NOFILE += maps03
endif endif
endif endif
ifeq ($(SRCARCH),s390) ifeq ($(ARCH),s390)
TST_NOFILE += s390x_regs_check \ TST_NOFILE += s390x_regs_check \
s390x_gs_threads \ s390x_gs_threads \
s390x_runtime_instr s390x_runtime_instr