From patchwork Thu Feb 22 11:53:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 876609 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3znCRw4l1zz9sW3; Thu, 22 Feb 2018 22:53:48 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1eopRY-0001Qp-OU; Thu, 22 Feb 2018 11:53:44 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1eopRW-0001Pw-3m for kernel-team@lists.ubuntu.com; Thu, 22 Feb 2018 11:53:42 +0000 Received: from 1.general.apw.uk.vpn ([10.172.192.78] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1eopRV-0002vJ-RG; Thu, 22 Feb 2018 11:53:41 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [artful/master-next 1/3] UBUNTU: [Packaging] retpoline-extract -- instantiate retpoline files for i386 Date: Thu, 22 Feb 2018 11:53:38 +0000 Message-Id: <20180222115340.11733-2-apw@canonical.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180222115340.11733-1-apw@canonical.com> References: <20180222115340.11733-1-apw@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andy Whitcroft MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- debian/scripts/retpoline-extract | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } '