Skip to contentSkip to conversation

Patch "objtool: Move synced files to their original relative locations" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Dec 27, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

objtool: Move synced files to their original relative locations

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
objtool-move-synced-files-to-their-original-relative-locations.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 6a77cff819ae3e31992bde6432c9b5720748a89b Mon Sep 17 00:00:00 2001

From: Josh Poimboeuf <[email protected]>
Date: Mon, 6 Nov 2017 07:21:50 -0600
Subject: objtool: Move synced files to their original relative locations

From: Josh Poimboeuf <[email protected]>

commit 6a77cff819ae3e31992bde6432c9b5720748a89b upstream.

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

---
 tools/objtool/.gitignore                           |    2 
 tools/objtool/Makefile                             |   22 
 tools/objtool/arch/x86/Build                       |   10 
 tools/objtool/arch/x86/decode.c                    |    6 
 tools/objtool/arch/x86/include/asm/inat.h          |  234 ++++
 tools/objtool/arch/x86/include/asm/inat_types.h    |   29 
 tools/objtool/arch/x86/include/asm/insn.h          |  211 ++++
 tools/objtool/arch/x86/include/asm/orc_types.h     |  107 ++
 tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk  |  393 -------
 tools/objtool/arch/x86/insn/inat.c                 |   97 -
 tools/objtool/arch/x86/insn/inat.h                 |  234 ----
 tools/objtool/arch/x86/insn/inat_types.h           |   29 
 tools/objtool/arch/x86/insn/insn.c                 |  606 -----------
 tools/objtool/arch/x86/insn/insn.h                 |  211 ----
 tools/objtool/arch/x86/insn/x86-opcode-map.txt     | 1063 ---------------------
 tools/objtool/arch/x86/lib/inat.c                  |   97 +
 tools/objtool/arch/x86/lib/insn.c                  |  606 +++++++++++
 tools/objtool/arch/x86/lib/x86-opcode-map.txt      | 1063 +++++++++++++++++++++
 tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk |  393 +++++++
 tools/objtool/orc.h                                |    2 
 tools/objtool/orc_types.h                          |  107 --
 21 files changed, 2762 insertions(+), 2760 deletions(-)
tools/objtool/.gitignore +1 -1
@@ -1,3 +1,3 @@
-arch/x86/insn/inat-tables.c
+arch/x86/lib/inat-tables.c
 objtool
 fixdep
tools/objtool/Makefile +12 -10
@@ -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
@@ -1,12 +1,12 @@
 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
@@ -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/include/asm/inat.h new file +234 -0

234 lines not on this page · raw message

tools/objtool/arch/x86/include/asm/inat_types.h new file +29 -0
@@ -0,0 +1,29 @@
+#ifndef _ASM_X86_INAT_TYPES_H
+#define _ASM_X86_INAT_TYPES_H
+/*
+ * x86 instruction attributes
+ *
+ * Written by Masami Hiramatsu <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+/* Instruction attributes */
+typedef unsigned int insn_attr_t;
+typedef unsigned char insn_byte_t;
+typedef signed int insn_value_t;
+
+#endif
tools/objtool/arch/x86/include/asm/insn.h new file +211 -0

211 lines not on this page · raw message

tools/objtool/arch/x86/include/asm/orc_types.h new file +107 -0

107 lines not on this page · raw message

tools/objtool/arch/x86/insn/gen-insn-attr-x86.awk deleted +0 -393

393 lines not on this page · raw message

tools/objtool/arch/x86/insn/inat.c deleted +0 -97

97 lines not on this page · raw message

tools/objtool/arch/x86/insn/inat.h deleted +0 -234

234 lines not on this page · raw message

tools/objtool/arch/x86/insn/inat_types.h deleted +0 -29
@@ -1,29 +0,0 @@
-#ifndef _ASM_X86_INAT_TYPES_H
-#define _ASM_X86_INAT_TYPES_H
-/*
- * x86 instruction attributes
- *
- * Written by Masami Hiramatsu <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-/* Instruction attributes */
-typedef unsigned int insn_attr_t;
-typedef unsigned char insn_byte_t;
-typedef signed int insn_value_t;
-
-#endif
tools/objtool/arch/x86/insn/insn.c deleted +0 -606

606 lines not on this page · raw message

tools/objtool/arch/x86/insn/insn.h deleted +0 -211

211 lines not on this page · raw message

tools/objtool/arch/x86/insn/x86-opcode-map.txt deleted +0 -1063

774 lines not on this page · raw message

tools/objtool/arch/x86/lib/inat.c new file +97 -0

97 lines not on this page · raw message

tools/objtool/arch/x86/lib/insn.c new file +606 -0

606 lines not on this page · raw message

tools/objtool/arch/x86/lib/x86-opcode-map.txt new file +1063 -0

1,063 lines not on this page · raw message

tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk new file +393 -0

393 lines not on this page · raw message

tools/objtool/orc.h +1 -1

Lines of this file are not shown. View the raw message.

tools/objtool/orc_types.h deleted +0 -107

107 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/x86-decoder-fix-and-update-the-opcodes-map.patch queue-4.14/tools-headers-sync-objtool-uapi-header.patch queue-4.14/objtool-fix-64-bit-build-on-32-bit-host.patch queue-4.14/objtool-move-synced-files-to-their-original-relative-locations.patch queue-4.14/objtool-move-kernel-headers-code-sync-check-to-a-script.patch queue-4.14/objtool-fix-cross-build.patch

Part of the diff is not shown here. View the raw message.