diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/zdtm/Makefile.inc | 7 | ||||
| -rw-r--r-- | test/zdtm/static/Makefile | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc index 170f31632..d5c013a3e 100644 --- a/test/zdtm/Makefile.inc +++ b/test/zdtm/Makefile.inc @@ -15,12 +15,9 @@ ARCH ?= $(shell uname -m | sed \ -e s/aarch64.*/arm64/) ifeq ($(ARCH),arm64) - ARCH ?= aarch64 - SRCARCH ?= aarch64 + ARCH := aarch64 endif -SRCARCH ?= $(ARCH) - ifeq ($(ARCH),arm) 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 += $(USERCFLAGS) CFLAGS += -D_GNU_SOURCE -CPPFLAGS += -iquote $(LIBDIR)/arch/$(SRCARCH)/include +CPPFLAGS += -iquote $(LIBDIR)/arch/$(ARCH)/include ifeq ($(strip $(V)),) E = @echo diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile index a38482f44..e0d4d2c5c 100644 --- a/test/zdtm/static/Makefile +++ b/test/zdtm/static/Makefile @@ -219,13 +219,13 @@ TST_NOFILE := \ child_subreaper_and_reparent \ # jobctl00 \ -ifneq ($(SRCARCH),arm) +ifneq ($(ARCH),arm) ifneq ($(COMPAT_TEST),y) TST_NOFILE += maps03 endif endif -ifeq ($(SRCARCH),s390) +ifeq ($(ARCH),s390) TST_NOFILE += s390x_regs_check \ s390x_gs_threads \ s390x_runtime_instr |