summaryrefslogtreecommitdiffstats
path: root/tools/objtool
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2016-07-13 15:33:54 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-07-13 23:08:54 -0300
commit1a4bf28573c82b4cbeb4e8d3326b24a93ed64c8e (patch)
tree24da0a644a6186fa2c46cb0531c463ce837e6358 /tools/objtool
parent774bec3fddcccb0b36f319c6d6e8148dc5e8c937 (diff)
downloadop-kernel-dev-1a4bf28573c82b4cbeb4e8d3326b24a93ed64c8e.zip
op-kernel-dev-1a4bf28573c82b4cbeb4e8d3326b24a93ed64c8e.tar.gz
objtool: Avoid checking code drift on busybox's diff
That doesn't have -I to match lines. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/n/tip-1zqv1h6okt70e2huokkdtf1u@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/objtool')
-rw-r--r--tools/objtool/Makefile5
1 files changed, 4 insertions, 1 deletions
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 && \
OpenPOWER on IntegriCloud