[artful/master-next,1/2] UBUNTU: [Packaging] retpoline-extract -- instantiate retpoline files for i386
diff mbox series

Message ID 20180222113011.9116-2-apw@canonical.com
State New
Headers show
Series
  • [artful/master-next,1/2] UBUNTU: [Packaging] retpoline-extract -- instantiate retpoline files for i386
Related show

Commit Message

Andy Whitcroft Feb. 22, 2018, 11:30 a.m. UTC
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>
---
 debian/scripts/retpoline-extract | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch
diff mbox series

diff --git a/debian/scripts/retpoline-extract b/debian/scripts/retpoline-extract
index c401f2f72354..3bdc8b5a4631 100755
--- 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); }
 '