From patchwork Thu Jan 7 17:55:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 7978751 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D93909F3E6 for ; Thu, 7 Jan 2016 17:55:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2031A20122 for ; Thu, 7 Jan 2016 17:55:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FEE220117 for ; Thu, 7 Jan 2016 17:55:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752795AbcAGRz2 (ORCPT ); Thu, 7 Jan 2016 12:55:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34838 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751920AbcAGRz1 (ORCPT ); Thu, 7 Jan 2016 12:55:27 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 23E6EA2023; Thu, 7 Jan 2016 17:55:27 +0000 (UTC) Received: from redhat.com (vpn1-6-132.ams2.redhat.com [10.36.6.132]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id u07HtOZ3026136; Thu, 7 Jan 2016 12:55:25 -0500 Date: Thu, 7 Jan 2016 19:55:24 +0200 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Michal Marek , linux-kbuild@vger.kernel.org, linux-mips@linux-mips.org, ralf@linux-mips.org Subject: [PATCH] ld-version: fix it on Fedora Message-ID: <1452189189-31188-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Fedora 23, ld --version outputs: GNU ld version 2.25-15.fc23 But ld-version.sh fails to parse this, so e.g. mips build fails to enable VDSO, printing a warning that binutils >= 2.24 is required. To fix, teach ld-version to parse this format. Signed-off-by: Michael S. Tsirkin --- Which tree should this be merged through? Mine? MIPS? scripts/ld-version.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh index 198580d..25d23c8 100755 --- a/scripts/ld-version.sh +++ b/scripts/ld-version.sh @@ -2,6 +2,8 @@ # extract linker version number from stdin and turn into single number { gsub(".*)", ""); + gsub(".*version ", ""); + gsub("-.*", ""); split($1,a, "."); print a[1]*10000000 + a[2]*100000 + a[3]*10000 + a[4]*100 + a[5]; exit