Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a4bf285 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 774bec3f

tools/objtool/Makefile

+4 −1
Original line number Original line Diff line number Diff line
@@ -41,8 +41,11 @@ include $(srctree)/tools/build/Makefile.include 
$(OBJTOOL_IN): fixdep FORCE

$(OBJTOOL_IN): fixdep FORCE

	@$(MAKE) $(build)=objtool

	@$(MAKE) $(build)=objtool





# Busybox's diff doesn't have -I, avoid warning in that case

#

$(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)

$(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/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 -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 && \

	diff arch/x86/insn/x86-opcode-map.txt ../../arch/x86/lib/x86-opcode-map.txt >/dev/null && \