1 files changed, 2 insertions, 16 deletions
diff --git a/tools/testing/selftests/kcmp/Makefile b/tools/testing/selftests/kcmp/Makefile
index 4f00c0524501..ff0eefdc6ceb 100644
--- a/tools/testing/selftests/kcmp/Makefile
+++ b/tools/testing/selftests/kcmp/Makefile
@@ -1,21 +1,7 @@
-uname_M := $(shell uname -m 2>/dev/null || echo not)
+CC := $(CROSS_COMPILE)$(CC)
-ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/)
-ifeq ($(ARCH),i386)
-        ARCH := x86
-        CFLAGS := -DCONFIG_X86_32 -D__i386__
-endif
-ifeq ($(ARCH),x86_64)
-        ARCH := x86
-        CFLAGS := -DCONFIG_X86_64 -D__x86_64__
-endif
 CFLAGS += -I../../../../usr/include/
-all:
+all: kcmp_test
-ifeq ($(ARCH),x86)
-        gcc $(CFLAGS) kcmp_test.c -o kcmp_test
-else
-        echo "Not an x86 target, can't build kcmp selftest"
-endif
 run_tests: all
        @./kcmp_test || echo "kcmp_test: [FAIL]"

diff --git a/tools/testing/selftests/kcmp/Makefile b/tools/testing/selftests/kcmp/Makefile index 4f00c0524501..ff0eefdc6ceb 100644 --- a/tools/testing/selftests/kcmp/Makefile +++ b/tools/testing/selftests/kcmp/Makefile
@@ -1,21 +1,7 @@
1	uname_M := $(shell uname -m 2>/dev/null \|\| echo not)	1	CC := $(CROSS_COMPILE)$(CC)
2	ARCH ?= $(shell echo $(uname_M) \| sed -e s/i.86/i386/)
3	ifeq ($(ARCH),i386)
4	ARCH := x86
5	CFLAGS := -DCONFIG_X86_32 -D__i386__
6	endif
7	ifeq ($(ARCH),x86_64)
8	ARCH := x86
9	CFLAGS := -DCONFIG_X86_64 -D__x86_64__
10	endif
11	CFLAGS += -I../../../../usr/include/	2	CFLAGS += -I../../../../usr/include/
12		3
13	all:	4	all: kcmp_test
14	ifeq ($(ARCH),x86)
15	gcc $(CFLAGS) kcmp_test.c -o kcmp_test
16	else
17	echo "Not an x86 target, can't build kcmp selftest"
18	endif
19		5
20	run_tests: all	6	run_tests: all
21	@./kcmp_test \|\| echo "kcmp_test: [FAIL]"	7	@./kcmp_test \|\| echo "kcmp_test: [FAIL]"