UBUNTU: [Packaging] retpoline-extract -- instantiate retpoline files for i386

We are extracting all indirect callq/jmpq but in 32bit mode these are
call/jmp so we need to allow those as well in our extraction.

BugLink: http://bugs.launchpad.net/bugs/1751021
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/debian/scripts/retpoline-extract b/debian/scripts/retpoline-extract
index c401f2f72354e448a93032d8fc1fc37b6206f234..3bdc8b5a463147e1547728ac2557bfb28f0b800e 100755 (executable)
--- a/debian/scripts/retpoline-extract
+++ b/debian/scripts/retpoline-extract
@@ -9,5 +9,5 @@ cd "$1" || exit 1
 awk -F'        ' '
        /^.\//                          { file=$1; sub(":.*", "", file); sub("^.*/", "", file); }
        /^[0-9a-f][0-9a-f]* <.*>:/      { tag=$1; sub(".*<", "", tag); sub(">.*", "", tag); tag=file " " tag; }
-       $3 ~ /(callq|jmpq)  *\*%/       { print(tag " " $3); }
+       $3 ~ /(call|jmp)q?  *\*%/       { print(tag " " $3); }
 '