From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751186AbcGNHCh (ORCPT ); Thu, 14 Jul 2016 03:02:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:45182 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750852AbcGNHCa (ORCPT ); Thu, 14 Jul 2016 03:02:30 -0400 Date: Thu, 14 Jul 2016 00:02:12 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, adrian.hunter@intel.com, wangnan0@huawei.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@kernel.org, jpoimboe@redhat.com, acme@redhat.com, tglx@linutronix.de, dsahern@gmail.com Reply-To: namhyung@kernel.org, wangnan0@huawei.com, adrian.hunter@intel.com, hpa@zytor.com, mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, acme@redhat.com, tglx@linutronix.de, dsahern@gmail.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] objtool: Avoid checking code drift on busybox's diff Git-Commit-ID: 1a4bf28573c82b4cbeb4e8d3326b24a93ed64c8e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1a4bf28573c82b4cbeb4e8d3326b24a93ed64c8e Gitweb: http://git.kernel.org/tip/1a4bf28573c82b4cbeb4e8d3326b24a93ed64c8e Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 13 Jul 2016 15:33:54 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 13 Jul 2016 23:08:54 -0300 objtool: Avoid checking code drift on busybox's diff That doesn't have -I to match lines. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-1zqv1h6okt70e2huokkdtf1u@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/objtool/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile index f094f3c..9a3110c 100644 --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile @@ -41,8 +41,11 @@ include $(srctree)/tools/build/Makefile.include $(OBJTOOL_IN): fixdep FORCE @$(MAKE) $(build)=objtool +# Busybox's diff doesn't have -I, avoid warning in that case +# $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN) - @(test -d ../../kernel -a -d ../../tools -a -d ../objtool && (( \ + @(diff -I 2>&1 | grep -q 'option requires an argument' && \ + test -d ../../kernel -a -d ../../tools -a -d ../objtool && (( \ diff -I'^#include' arch/x86/insn/insn.c ../../arch/x86/lib/insn.c >/dev/null && \ diff -I'^#include' arch/x86/insn/inat.c ../../arch/x86/lib/inat.c >/dev/null && \ diff arch/x86/insn/x86-opcode-map.txt ../../arch/x86/lib/x86-opcode-map.txt >/dev/null && \