lkml.org 
[lkml]   [2009]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 1/9] x86: Adjust the coding style of vdso-layout.lds.S
Date
The style we try to introduce for .lds files in
arch/$ARCH/kernel/vmlinux.lds.S is much more C-like.

Use the same style in the vDSO linker script to get a consistent
style in linker scripts.

Credits to Sam Ravnborg for suggesting this change.

Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
---
arch/x86/vdso/vdso-layout.lds.S | 76 +++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/arch/x86/vdso/vdso-layout.lds.S b/arch/x86/vdso/vdso-layout.lds.S
index 634a2cf..917df03 100644
--- a/arch/x86/vdso/vdso-layout.lds.S
+++ b/arch/x86/vdso/vdso-layout.lds.S
@@ -8,34 +8,62 @@ SECTIONS
{
. = VDSO_PRELINK + SIZEOF_HEADERS;

- .hash : { *(.hash) } :text
- .gnu.hash : { *(.gnu.hash) }
- .dynsym : { *(.dynsym) }
- .dynstr : { *(.dynstr) }
- .gnu.version : { *(.gnu.version) }
- .gnu.version_d : { *(.gnu.version_d) }
- .gnu.version_r : { *(.gnu.version_r) }
+ .hash : {
+ *(.hash)
+ } :text
+ .gnu.hash : {
+ *(.gnu.hash)
+ }
+ .dynsym : {
+ *(.dynsym)
+ }
+ .dynstr : {
+ *(.dynstr)
+ }
+ .gnu.version : {
+ *(.gnu.version)
+ }
+ .gnu.version_d : {
+ *(.gnu.version_d)
+ }
+ .gnu.version_r : {
+ *(.gnu.version_r)
+ }

- .note : { *(.note.*) } :text :note
+ .note : {
+ *(.note.*)
+ } :text :note

- .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr
- .eh_frame : { KEEP (*(.eh_frame)) } :text
+ .eh_frame_hdr : {
+ *(.eh_frame_hdr)
+ } :text :eh_frame_hdr
+ .eh_frame : {
+ KEEP (*(.eh_frame))
+ } :text

- .dynamic : { *(.dynamic) } :text :dynamic
+ .dynamic : {
+ *(.dynamic)
+ } :text :dynamic

- .rodata : { *(.rodata*) } :text
- .data : {
- *(.data*)
- *(.sdata*)
- *(.got.plt) *(.got)
- *(.gnu.linkonce.d.*)
- *(.bss*)
- *(.dynbss*)
- *(.gnu.linkonce.b.*)
+ .rodata : {
+ *(.rodata*)
+ } :text
+ .data : {
+ *(.data*)
+ *(.sdata*)
+ *(.got.plt) *(.got)
+ *(.gnu.linkonce.d.*)
+ *(.bss*)
+ *(.dynbss*)
+ *(.gnu.linkonce.b.*)
}

- .altinstructions : { *(.altinstructions) }
- .altinstr_replacement : { *(.altinstr_replacement) }
+ .altinstructions : {
+ *(.altinstructions)
+ }
+ .altinstr_replacement : {
+ *(.altinstr_replacement)
+ }

/*
* Align the actual code well away from the non-instruction data.
@@ -43,7 +71,9 @@ SECTIONS
*/
. = ALIGN(0x100);

- .text : { *(.text*) } :text =0x90909090
+ .text : {
+ *(.text*)
+ } :text =0x90909090
}

/*
--
1.6.0.2


\
 
 \ /
  Last update: 2009-06-16 14:59    [W:1.742 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site