From patchwork Thu Apr 3 17:43:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Trippelsdorf X-Patchwork-Id: 3933651 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3691FBFF02 for ; Thu, 3 Apr 2014 17:43:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 668CA202EC for ; Thu, 3 Apr 2014 17:43:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00B65202EA for ; Thu, 3 Apr 2014 17:43:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753055AbaDCRnm (ORCPT ); Thu, 3 Apr 2014 13:43:42 -0400 Received: from ud10.udmedia.de ([194.117.254.50]:38071 "EHLO mail.ud10.udmedia.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752992AbaDCRnl (ORCPT ); Thu, 3 Apr 2014 13:43:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=mail.ud10.udmedia.de; h= date:from:to:cc:subject:message-id:mime-version:content-type; s= beta; bh=A2QST3Y4TLG2TM//BagtvVbCDf5+FQIDCDNDsEwKOg8=; b=vKRC6xa ek3Yhb/98+86U+p2yQ07stoNMmdHeGcjj4h/oOboGg71Xw1ZF9j4AuS0hDjVGVxf 1sILIOHZBDElSEL+4iuTnuP/qvrz8bti8E31GgyvMbM3IPFC5sRcAKYAOJluuSfS ybHA/3MXw6G7HDR/J8ySZoGF1XRbJJwOh290= Received: (qmail 31057 invoked from network); 3 Apr 2014 19:43:39 +0200 Received: from unknown (HELO x4) (ud10?360p3@24.134.29.106) by mail.ud10.udmedia.de with ESMTPSA (DHE-RSA-AES256-SHA encrypted, authenticated); 3 Apr 2014 19:43:39 +0200 Date: Thu, 3 Apr 2014 19:43:39 +0200 From: Markus Trippelsdorf To: linux-nfs@vger.kernel.org Cc: Andy Lutomirski , "H. Peter Anvin" Subject: [PATCH] x86, vdso: Fix vdso-layout linker script Message-ID: <20140403174339.GA284@x4> MIME-Version: 1.0 Content-Disposition: inline Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Commit 26f5ef2e3c3 added a /DISCARD/ section to the vdso-layout.lds.S linker script. This broke the build when using the gold linker: ld: error: arch/x86/vdso/vdso.lds:79:12: syntax error, unexpected ':' ld: fatal error: unable to parse script file arch/x86/vdso/vdso.lds As Cary Coutant pointed out on the sourceware bugzilla: https://sourceware.org/bugzilla/show_bug.cgi?id=16804 the problem is that the .text section directly above the /DISCARD/ section should be terminated with an comma. Signed-off-by: Markus Trippelsdorf diff --git a/arch/x86/vdso/vdso-layout.lds.S b/arch/x86/vdso/vdso-layout.lds.S index 2e263f367b13..313bca59ddea 100644 --- a/arch/x86/vdso/vdso-layout.lds.S +++ b/arch/x86/vdso/vdso-layout.lds.S @@ -61,7 +61,7 @@ SECTIONS */ . = ALIGN(0x100); - .text : { *(.text*) } :text =0x90909090 + .text : { *(.text*) } :text =0x90909090, /DISCARD/ : { *(.discard)