1 files changed, 31 insertions, 22 deletions

diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile
index ddf63569df5a..5bdb781163d1 100644
--- a/tools/testing/selftests/x86/Makefile
+++ b/tools/testing/selftests/x86/Makefile
@@ -1,4 +1,8 @@
-.PHONY: all all_32 all_64 check_build32 clean run_tests
+all:
+
+include ../lib.mk
+
+.PHONY: all all_32 all_64 warn_32bit_failure clean
 
 TARGETS_C_BOTHBITS := sigreturn single_step_syscall
 
@@ -7,42 +11,47 @@ BINARIES_64 := $(TARGETS_C_BOTHBITS:%=%_64)
 
 CFLAGS := -O2 -g -std=gnu99 -pthread -Wall
 
-UNAME_P := $(shell uname -p)
+UNAME_M := $(shell uname -m)
+CAN_BUILD_I386 := $(shell ./check_cc.sh $(CC) trivial_32bit_program.c -m32)
+CAN_BUILD_X86_64 := $(shell ./check_cc.sh $(CC) trivial_64bit_program.c)
 
-# Always build 32-bit tests
+ifeq ($(CAN_BUILD_I386),1)
 all: all_32
+TEST_PROGS += $(BINARIES_32)
+endif
 
-# If we're on a 64-bit host, build 64-bit tests as well
-ifeq ($(shell uname -p),x86_64)
+ifeq ($(CAN_BUILD_X86_64),1)
 all: all_64
+TEST_PROGS += $(BINARIES_64)
 endif
 
-all_32: check_build32 $(BINARIES_32)
+all_32: $(BINARIES_32)
 
 all_64: $(BINARIES_64)
 
 clean:
         $(RM) $(BINARIES_32) $(BINARIES_64)
 
-run_tests:
-        ./run_x86_tests.sh
-
 $(TARGETS_C_BOTHBITS:%=%_32): %_32: %.c
         $(CC) -m32 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl
 
 $(TARGETS_C_BOTHBITS:%=%_64): %_64: %.c
         $(CC) -m64 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl
 
-check_build32:
-        @if ! $(CC) -m32 -o /dev/null trivial_32bit_program.c; then     \
-          echo "Warning: you seem to have a broken 32-bit build" 2>&1;  \
-          echo "environment.  If you are using a Debian-like";          \
-          echo " distribution, try:";                                   \
-          echo "";                                                      \
-          echo "  apt-get install gcc-multilib libc6-i386 libc6-dev-i386"; \
-          echo "";                                                      \
-          echo "If you are using a Fedora-like distribution, try:";     \
-          echo "";                                                      \
-          echo "  yum install glibc-devel.*i686";                       \
-          exit 1;                                                       \
-        fi
+# x86_64 users should be encouraged to install 32-bit libraries
+ifeq ($(CAN_BUILD_I386)$(CAN_BUILD_X86_64),01)
+all: warn_32bit_failure
+
+warn_32bit_failure:
+        @echo "Warning: you seem to have a broken 32-bit build" 2>&1;   \
+        echo "environment.  This will reduce test coverage of 64-bit" 2>&1; \
+        echo "kernels.  If you are using a Debian-like distribution," 2>&1; \
+        echo "try:"; 2>&1; \
+        echo "";                                                        \
+        echo "  apt-get install gcc-multilib libc6-i386 libc6-dev-i386"; \
+        echo "";                                                        \
+        echo "If you are using a Fedora-like distribution, try:";       \
+        echo "";                                                        \
+        echo "  yum install glibc-devel.*i686";                         \
+        exit 0;
+endif