From 2f45681b0828bec503a08b7907568517355b4d15 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 17 Oct 2007 18:04:41 +0200
Subject: [PATCH] --- yaml --- r: 71025 b: refs/heads/master c:
 c65916fe3586521932fbd1b734f39744657f2f0d h: refs/heads/master i:   71023:
 f3b3798abec35cf01d2941efe174799a0d33c6c5 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/x86/vdso/vdso.lds.S | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 7423633eafaa..600d820d0c57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de8aacbe6a3f3dd7104da09a5535232cd385fdd6
+refs/heads/master: c65916fe3586521932fbd1b734f39744657f2f0d
diff --git a/trunk/arch/x86/vdso/vdso.lds.S b/trunk/arch/x86/vdso/vdso.lds.S
index b9a60e665d08..667d3245d972 100644
--- a/trunk/arch/x86/vdso/vdso.lds.S
+++ b/trunk/arch/x86/vdso/vdso.lds.S
@@ -26,13 +26,16 @@ SECTIONS
      is insufficient, ld -shared will barf.  Just increase it here.  */
   . = VDSO_PRELINK + VDSO_TEXT_OFFSET;
 
-  .text           : { *(.text) }		:text
-  .text.ptr       : { *(.text.ptr) }		:text
-  . = VDSO_PRELINK + 0x900;
-  .data           : { *(.data) }		:text
-  .bss            : { *(.bss) }			:text
+  .text           : { *(.text*) }		:text
+  .rodata         : { *(.rodata*) }		:text
+  .data		  : {
+	*(.data*)
+	*(.sdata*)
+	*(.bss*)
+	*(.dynbss*)
+  }						:text
 
-  .altinstructions : { *(.altinstructions) }			:text
+  .altinstructions : { *(.altinstructions) }		:text
   .altinstr_replacement  : { *(.altinstr_replacement) }	:text
 
   .note		  : { *(.note.*) }		:text :note
@@ -42,7 +45,6 @@ SECTIONS
   .useless        : {
   	*(.got.plt) *(.got)
 	*(.gnu.linkonce.d.*)
-	*(.dynbss)
 	*(.gnu.linkonce.b.*)
   }						:text
 }