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

Commit 62c37437 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Greg Kroah-Hartman
Browse files

objtool: Move synced files to their original relative locations 



commit 6a77cff819ae3e31992bde6432c9b5720748a89b upstream.

This will enable more straightforward comparisons, and it also makes the
files 100% identical.

Suggested-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/407b2aaa317741f48fcf821592c0e96ab3be1890.1509974346.git.jpoimboe@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent add9f2a4

tools/objtool/.gitignore

+1 −1
Original line number Diff line number Diff line 
arch/x86/insn/inat-tables.c

arch/x86/lib/inat-tables.c

objtool

fixdep

tools/objtool/Makefile

+12 −10
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ OBJTOOL_IN := $(OBJTOOL)-in.o 


all: $(OBJTOOL)



INCLUDES := -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi

INCLUDES := -I$(srctree)/tools/include \

	    -I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \

	    -I$(srctree)/tools/objtool/arch/$(HOSTARCH)/include

WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed

CFLAGS   += -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES)

LDFLAGS  += -lelf $(LIBSUBCMD)
@@ -46,16 +48,16 @@ $(OBJTOOL_IN): fixdep FORCE 
$(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)

	@(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 && \

	diff arch/x86/insn/gen-insn-attr-x86.awk ../../arch/x86/tools/gen-insn-attr-x86.awk >/dev/null && \

	diff -I'^#include' arch/x86/insn/insn.h ../../arch/x86/include/asm/insn.h >/dev/null && \

	diff -I'^#include' arch/x86/insn/inat.h ../../arch/x86/include/asm/inat.h >/dev/null && \

	diff -I'^#include' arch/x86/insn/inat_types.h ../../arch/x86/include/asm/inat_types.h >/dev/null) \

	diff arch/x86/lib/insn.c ../../arch/x86/lib/insn.c >/dev/null && \

	diff arch/x86/lib/inat.c ../../arch/x86/lib/inat.c >/dev/null && \

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

	diff arch/x86/tools/gen-insn-attr-x86.awk ../../arch/x86/tools/gen-insn-attr-x86.awk >/dev/null && \

	diff arch/x86/include/asm/insn.h ../../arch/x86/include/asm/insn.h >/dev/null && \

	diff arch/x86/include/asm/inat.h ../../arch/x86/include/asm/inat.h >/dev/null && \

	diff arch/x86/include/asm/inat_types.h ../../arch/x86/include/asm/inat_types.h >/dev/null) \

	|| echo "warning: objtool: x86 instruction decoder differs from kernel" >&2 )) || true

	@(test -d ../../kernel -a -d ../../tools -a -d ../objtool && (( \

	diff ../../arch/x86/include/asm/orc_types.h orc_types.h >/dev/null) \

	diff ../../arch/x86/include/asm/orc_types.h arch/x86/include/asm/orc_types.h >/dev/null) \

	|| echo "warning: objtool: orc_types.h differs from kernel" >&2 )) || true

	$(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@
@@ -66,7 +68,7 @@ $(LIBSUBCMD): fixdep FORCE 
clean:

	$(call QUIET_CLEAN, objtool) $(RM) $(OBJTOOL)

	$(Q)find $(OUTPUT) -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)$(RM) $(OUTPUT)arch/x86/insn/inat-tables.c $(OUTPUT)fixdep

	$(Q)$(RM) $(OUTPUT)arch/x86/lib/inat-tables.c $(OUTPUT)fixdep



FORCE:

tools/objtool/arch/x86/Build

+5 −5
Original line number Diff line number Diff line 
objtool-y += decode.o



inat_tables_script = arch/x86/insn/gen-insn-attr-x86.awk

inat_tables_maps = arch/x86/insn/x86-opcode-map.txt

inat_tables_script = arch/x86/tools/gen-insn-attr-x86.awk

inat_tables_maps = arch/x86/lib/x86-opcode-map.txt



$(OUTPUT)arch/x86/insn/inat-tables.c: $(inat_tables_script) $(inat_tables_maps)

$(OUTPUT)arch/x86/lib/inat-tables.c: $(inat_tables_script) $(inat_tables_maps)

	$(call rule_mkdir)

	$(Q)$(call echo-cmd,gen)$(AWK) -f $(inat_tables_script) $(inat_tables_maps) > $@



$(OUTPUT)arch/x86/decode.o: $(OUTPUT)arch/x86/insn/inat-tables.c

$(OUTPUT)arch/x86/decode.o: $(OUTPUT)arch/x86/lib/inat-tables.c



CFLAGS_decode.o += -I$(OUTPUT)arch/x86/insn
 
CFLAGS_decode.o += -I$(OUTPUT)arch/x86/lib

tools/objtool/arch/x86/decode.c

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#include <stdlib.h>



#define unlikely(cond) (cond)

#include "insn/insn.h"

#include "insn/inat.c"

#include "insn/insn.c"

#include <asm/insn.h>

#include "lib/inat.c"

#include "lib/insn.c"



#include "../../elf.h"

#include "../../arch.h"

tools/objtool/arch/x86/insn/inat.h→tools/objtool/arch/x86/include/asm/inat.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

 *

 */

#include "inat_types.h"

#include <asm/inat_types.h>



/*

 * Internal bits. Don't use bitmasks directly, because these bits are