[gentoo-commits] proj/linux-patches:5.3 commit in: /

[Mike Pagano]

commit:     c2f22be66c4c66dfca8c9700e773ecf41429d30b
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 23:07:49 2019 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 23:07:49 2019 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=c2f22be6

x86/insn: Fix awk regexp warnings. See bug #696846.

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 0000_README                    |  4 ++
 2900_awk-regexp-warnings.patch | 89 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/0000_README b/0000_README
index 075d9be..0d383a1 100644
--- a/0000_README
+++ b/0000_README
@@ -107,6 +107,10 @@ Patch:  2600_enable-key-swapping-for-apple-mac.patch
 From:   https://github.com/free5lot/hid-apple-patched
 Desc:   This hid-apple patch enables swapping of the FN and left Control keys and some additional on some apple keyboards. See bug #622902
 
+Patch:  2900_awk-regexp-warnings.patch
+From:   https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/commit/?id=700c1018b86d0d4b3f1f2d459708c0cdf42b521d
+Desc:   x86/insn: Fix awk regexp warnings. See bug #696846.
+
 Patch:  4567_distro-Gentoo-Kconfig.patch
 From:   Tom Wijsman <TomWij@g.o>
 Desc:   Add Gentoo Linux support config settings and defaults.

diff --git a/2900_awk-regexp-warnings.patch b/2900_awk-regexp-warnings.patch
new file mode 100644
index 0000000..5e62625
--- /dev/null
+++ b/2900_awk-regexp-warnings.patch
@@ -0,0 +1,89 @@
+From 700c1018b86d0d4b3f1f2d459708c0cdf42b521d Mon Sep 17 00:00:00 2001
+From: Alexander Kapshuk <alexander.kapshuk@×××××.com>
+Date: Tue, 24 Sep 2019 07:46:59 +0300
+Subject: x86/insn: Fix awk regexp warnings
+
+gawk 5.0.1 generates the following regexp warnings:
+
+  GEN      /home/sasha/torvalds/tools/objtool/arch/x86/lib/inat-tables.c
+  awk: ../arch/x86/tools/gen-insn-attr-x86.awk:260: warning: regexp escape sequence `\:' is not a known regexp operator
+  awk: ../arch/x86/tools/gen-insn-attr-x86.awk:350: (FILENAME=../arch/x86/lib/x86-opcode-map.txt FNR=41) warning: regexp escape sequence `\&' is  not a known regexp operator
+
+Ealier versions of gawk are not known to generate these warnings. The
+gawk manual referenced below does not list characters ':' and '&' as
+needing escaping, so 'unescape' them. See
+
+  https://www.gnu.org/software/gawk/manual/html_node/Escape-Sequences.html
+
+for more info.
+
+Running diff on the output generated by the script before and after
+applying the patch reported no differences.
+
+ [ bp: Massage commit message. ]
+
+[ Caught the respective tools header discrepancy. ]
+Reported-by: kbuild test robot <lkp@×××××.com>
+Signed-off-by: Alexander Kapshuk <alexander.kapshuk@×××××.com>
+Signed-off-by: Borislav Petkov <bp@××××.de>
+Acked-by: Masami Hiramatsu <mhiramat@××××××.org>
+Cc: "H. Peter Anvin" <hpa@×××××.com>
+Cc: "Peter Zijlstra (Intel)" <peterz@×××××××××.org>
+Cc: Arnaldo Carvalho de Melo <acme@××××××.com>
+Cc: Ingo Molnar <mingo@××××××.com>
+Cc: Josh Poimboeuf <jpoimboe@××××××.com>
+Cc: Thomas Gleixner <tglx@××××××××××.de>
+Cc: x86-ml <x86@××××××.org>
+Link: https://lkml.kernel.org/r/20190924044659.3785-1-alexander.kapshuk@×××××.com
+---
+ arch/x86/tools/gen-insn-attr-x86.awk       | 4 ++--
+ tools/arch/x86/tools/gen-insn-attr-x86.awk | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/arch/x86/tools/gen-insn-attr-x86.awk b/arch/x86/tools/gen-insn-attr-x86.awk
+index b02a36b2c14f..a42015b305f4 100644
+--- a/arch/x86/tools/gen-insn-attr-x86.awk
++++ b/arch/x86/tools/gen-insn-attr-x86.awk
+@@ -69,7 +69,7 @@ BEGIN {
+ 
+ 	lprefix1_expr = "\\((66|!F3)\\)"
+ 	lprefix2_expr = "\\(F3\\)"
+-	lprefix3_expr = "\\((F2|!F3|66\\&F2)\\)"
++	lprefix3_expr = "\\((F2|!F3|66&F2)\\)"
+ 	lprefix_expr = "\\((66|F2|F3)\\)"
+ 	max_lprefix = 4
+ 
+@@ -257,7 +257,7 @@ function convert_operands(count,opnd,       i,j,imm,mod)
+ 	return add_flags(imm, mod)
+ }
+ 
+-/^[0-9a-f]+\:/ {
++/^[0-9a-f]+:/ {
+ 	if (NR == 1)
+ 		next
+ 	# get index
+diff --git a/tools/arch/x86/tools/gen-insn-attr-x86.awk b/tools/arch/x86/tools/gen-insn-attr-x86.awk
+index b02a36b2c14f..a42015b305f4 100644
+--- a/tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk
++++ b/tools/objtool/arch/x86/tools/gen-insn-attr-x86.awk
+@@ -69,7 +69,7 @@ BEGIN {
+ 
+ 	lprefix1_expr = "\\((66|!F3)\\)"
+ 	lprefix2_expr = "\\(F3\\)"
+-	lprefix3_expr = "\\((F2|!F3|66\\&F2)\\)"
++	lprefix3_expr = "\\((F2|!F3|66&F2)\\)"
+ 	lprefix_expr = "\\((66|F2|F3)\\)"
+ 	max_lprefix = 4
+ 
+@@ -257,7 +257,7 @@ function convert_operands(count,opnd,       i,j,imm,mod)
+ 	return add_flags(imm, mod)
+ }
+ 
+-/^[0-9a-f]+\:/ {
++/^[0-9a-f]+:/ {
+ 	if (NR == 1)
+ 		next
+ 	# get index
+-- 
+cgit 1.2-0.3.lf.el7
+