From patchwork Fri Aug 17 07:39:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Lee X-Patchwork-Id: 1337721 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id ECF683FC71 for ; Fri, 17 Aug 2012 07:40:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030730Ab2HQHkL (ORCPT ); Fri, 17 Aug 2012 03:40:11 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:34597 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030708Ab2HQHkJ (ORCPT ); Fri, 17 Aug 2012 03:40:09 -0400 Received: by eeil10 with SMTP id l10so1122471eei.19 for ; Fri, 17 Aug 2012 00:40:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=9OoSVcmW+RDjcuiwBw58X9sEC+UdeM8A8AGp0SESrn0=; b=nW1D7My5B/FnOxIa19Mb3Ty32MQT6v05YQzr2bE/XNmb+dpZ21kGt6ETG/ieDKBW9u yaF1wB2ipROLWQZx+RrLLJqTi5NviGPjmRdpWx8SGZJCKZoC6e9XSg9Qq8hjRuD0PTTY tCvHQoSP92LISWdOBbu/U3nRnjwaymsgFC6On+1z5bGmmluOkDC1mH6CwPX16P7DJLCE TmEmgnigfylJyxIaKZwQo5QWnsp9nU+faxXQvD1uErzZCQAxOEC3WfpNdQST0GaOe4bY voHKJETDW2GIrLzMfQXxfz6Zm4TuiC6ywpEpYtJ80E2BrxlPi/1KaDceFZ++nkVamH41 BAnw== Received: by 10.14.176.6 with SMTP id a6mr2240778eem.13.1345189208339; Fri, 17 Aug 2012 00:40:08 -0700 (PDT) Received: from localhost ([203.114.244.88]) by mx.google.com with ESMTPS id u47sm17904962eeo.9.2012.08.17.00.40.04 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 17 Aug 2012 00:40:07 -0700 (PDT) From: Adam Lee To: linux-kernel@vger.kernel.org Cc: Michal Marek , linux-kbuild@vger.kernel.org (open list:KERNEL BUILD + fi...) Subject: [PATCH] kconfig: allow ARCH set to 'the machine hardware name', like 's390x' but not 's390' Date: Fri, 17 Aug 2012 15:39:59 +0800 Message-Id: <1345189199-22145-1-git-send-email-adam8157@gmail.com> X-Mailer: git-send-email 1.7.11.2 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org This patch add support for setting ARCH to 'the machine hardware name'(`uname -m). UTS_MACHINE is not always the same as SRCARCH, for example, s390x, we should set UTS_MACHINE=s390x, and SRCARCH=s390. This patch makes that working when "make ARCH=s390x". And it avoid some error during invocation of make when ARCH set to s390x, ppc64 or some machine hardware name else. Lots of scripts will have no need to hack(like what we did in Red Hat), just use `uname -m`. Signed-off-by: Adam Lee --- Makefile | 37 ++++++++----------------------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 9cc77ac..4f06c64 100644 --- a/Makefile +++ b/Makefile @@ -197,36 +197,15 @@ CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) # Architecture as present in compile.h UTS_MACHINE := $(ARCH) -SRCARCH := $(ARCH) -# Additional ARCH settings for x86 -ifeq ($(ARCH),i386) - SRCARCH := x86 -endif -ifeq ($(ARCH),x86_64) - SRCARCH := x86 -endif - -# Additional ARCH settings for sparc -ifeq ($(ARCH),sparc32) - SRCARCH := sparc -endif -ifeq ($(ARCH),sparc64) - SRCARCH := sparc -endif - -# Additional ARCH settings for sh -ifeq ($(ARCH),sh64) - SRCARCH := sh -endif - -# Additional ARCH settings for tile -ifeq ($(ARCH),tilepro) - SRCARCH := tile -endif -ifeq ($(ARCH),tilegx) - SRCARCH := tile -endif +# Where arch specific source located +SRCARCH := $(shell echo $(ARCH) | \ + sed -e s/i.86/x86/ -e s/x86_64/x86/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ \ + -e s/m68k.*/m68k/ -e s/mips.*/mips/ \ + -e s/parisc64/parisc/ -e s/ppc.*/powerpc/ \ + -e s/s390x/s390/ -e s/sh.*/sh/ -e s/sun4u/sparc/ \ + -e s/sparc.*/sparc/ -e s/tile.*/tile/ ) # Where to locate arch specific headers hdr-arch := $(SRCARCH)