Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933138AbbDNWxL (ORCPT ); Tue, 14 Apr 2015 18:53:11 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34293 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932794AbbDNWxE (ORCPT ); Tue, 14 Apr 2015 18:53:04 -0400 From: Tyler Baker To: Shuah Khan Cc: Kevin Hilman , John Stultz , Darren Hart , David Herrmann , Michael Ellerman , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tyler Baker Subject: [PATCH 5/7] selftests/x86: fix cross build logic Date: Tue, 14 Apr 2015 15:52:58 -0700 Message-Id: <1429051978-14778-1-git-send-email-tyler.baker@linaro.org> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2095 Lines: 79 x86 tests should not be built when ARCH != x86. Reused the logic from breakpoints to determine when it's appropriate to build. Signed-off-by: Tyler Baker --- tools/testing/selftests/x86/Makefile | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile index f0a7918..7be67a0 100644 --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@ -7,31 +7,36 @@ BINARIES_64 := $(TARGETS_C_BOTHBITS:%=%_64) CFLAGS := -O2 -g -std=gnu99 -pthread -Wall -UNAME_P := $(shell uname -p) - -# Always build 32-bit tests +# Taken from perf makefile +uname_M := $(shell uname -m 2>/dev/null || echo not) +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/) +ifeq ($(ARCH),i386) +ARCH := x86 all: all_32 - +endif +ifeq ($(ARCH),x86_64) +ARCH := x86 # If we're on a 64-bit host, build 64-bit tests as well -ifeq ($(shell uname -p),x86_64) -all: all_64 +all: all_32 all_64 endif all_32: check_build32 $(BINARIES_32) all_64: $(BINARIES_64) -clean: - $(RM) $(BINARIES_32) $(BINARIES_64) - -run_tests: - ./run_x86_tests.sh - $(TARGETS_C_BOTHBITS:%=%_32): %_32: %.c +ifeq ($(ARCH),x86) $(CC) -m32 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl +else + echo "Not an x86 target, can't build x86 tests" +endif $(TARGETS_C_BOTHBITS:%=%_64): %_64: %.c +ifeq ($(ARCH),x86) $(CC) -m64 -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl +else + echo "Not an x86 target, can't build x86 tests" +endif check_build32: @if ! $(CC) -m32 -o /dev/null trivial_32bit_program.c; then \ @@ -46,3 +51,9 @@ check_build32: echo " yum install glibc-devel.*i686"; \ exit 1; \ fi + +run_tests: + ./run_x86_tests.sh + +clean: + $(RM) $(BINARIES_32) $(BINARIES_64) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/