Linux NFS development
 help / color / mirror / Atom feed
From: Markus Trippelsdorf <markus@trippelsdorf.de>
To: linux-nfs@vger.kernel.org
Cc: Andy Lutomirski <luto@amacapital.net>,
	"H. Peter Anvin" <hpa@linux.intel.com>
Subject: [PATCH] x86, vdso: Fix vdso-layout linker script
Date: Thu, 3 Apr 2014 19:43:39 +0200	[thread overview]
Message-ID: <20140403174339.GA284@x4> (raw)

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 <markus@trippelsdorf.de>

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)
-- 
Markus

             reply	other threads:[~2014-04-03 17:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-03 17:43 Markus Trippelsdorf [this message]
2014-04-03 17:47 ` [PATCH] x86, vdso: Fix vdso-layout linker script Andy Lutomirski
2014-04-03 17:53 ` [PATCH] x86, vdso: Make the vdso linker script compatible with Gold Andy Lutomirski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140403174339.GA284@x4 \
    --to=markus@trippelsdorf.de \
    --cc=hpa@linux.intel.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=luto@amacapital.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox