Commit c4eecc99 authored by Roland McGrath's avatar Roland McGrath Committed by Linus Torvalds

SH vDSO: linker script indentation

This cleans up the formatting in the vDSO linker script, mostly just the
use of whitespace.  It's intended to approximate the kernel standard
conventions for indenting C, treating elements of the linker script about
like initialized variable definitions.
Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1a43be74
...@@ -17,45 +17,52 @@ ENTRY(__kernel_vsyscall); ...@@ -17,45 +17,52 @@ ENTRY(__kernel_vsyscall);
SECTIONS SECTIONS
{ {
. = SIZEOF_HEADERS; . = SIZEOF_HEADERS;
.hash : { *(.hash) } :text .hash : { *(.hash) } :text
.gnu.hash : { *(.gnu.hash) } .gnu.hash : { *(.gnu.hash) }
.dynsym : { *(.dynsym) } .dynsym : { *(.dynsym) }
.dynstr : { *(.dynstr) } .dynstr : { *(.dynstr) }
.gnu.version : { *(.gnu.version) } .gnu.version : { *(.gnu.version) }
.gnu.version_d : { *(.gnu.version_d) } .gnu.version_d : { *(.gnu.version_d) }
.gnu.version_r : { *(.gnu.version_r) } .gnu.version_r : { *(.gnu.version_r) }
/* This linker script is used both with -r and with -shared. /*
For the layouts to match, we need to skip more than enough * This linker script is used both with -r and with -shared.
space for the dynamic symbol table et al. If this amount * For the layouts to match, we need to skip more than enough
is insufficient, ld -shared will barf. Just increase it here. */ * space for the dynamic symbol table et al. If this amount
. = 0x400; * is insufficient, ld -shared will barf. Just increase it here.
*/
. = 0x400;
.text : { *(.text) } :text =0x90909090 .text : { *(.text) } :text =0x90909090
.note : { *(.note.*) } :text :note .note : { *(.note.*) } :text :note
.eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr .eh_frame_hdr : { *(.eh_frame_hdr ) } :text :eh_frame_hdr
.eh_frame : { KEEP (*(.eh_frame)) } :text .eh_frame : { KEEP (*(.eh_frame)) } :text
.dynamic : { *(.dynamic) } :text :dynamic .dynamic : { *(.dynamic) } :text :dynamic
.useless : { .useless : {
*(.got.plt) *(.got) *(.got.plt) *(.got)
*(.data .data.* .gnu.linkonce.d.*) *(.data .data.* .gnu.linkonce.d.*)
*(.dynbss) *(.dynbss)
*(.bss .bss.* .gnu.linkonce.b.*) *(.bss .bss.* .gnu.linkonce.b.*)
} :text } :text
} }
/*
* Very old versions of ld do not recognize this name token; use the constant.
*/
#define PT_GNU_EH_FRAME 0x6474e550
/* /*
* We must supply the ELF program headers explicitly to get just one * We must supply the ELF program headers explicitly to get just one
* PT_LOAD segment, and set the flags explicitly to make segments read-only. * PT_LOAD segment, and set the flags explicitly to make segments read-only.
*/ */
PHDRS PHDRS
{ {
text PT_LOAD FILEHDR PHDRS FLAGS(5); /* PF_R|PF_X */ text PT_LOAD FILEHDR PHDRS FLAGS(5); /* PF_R|PF_X */
dynamic PT_DYNAMIC FLAGS(4); /* PF_R */ dynamic PT_DYNAMIC FLAGS(4); /* PF_R */
note PT_NOTE FLAGS(4); /* PF_R */ note PT_NOTE FLAGS(4); /* PF_R */
eh_frame_hdr 0x6474e550; /* PT_GNU_EH_FRAME, but ld doesn't match the name */ eh_frame_hdr PT_GNU_EH_FRAME;
} }
/* /*
...@@ -63,12 +70,12 @@ PHDRS ...@@ -63,12 +70,12 @@ PHDRS
*/ */
VERSION VERSION
{ {
LINUX_2.6 { LINUX_2.6 {
global: global:
__kernel_vsyscall; __kernel_vsyscall;
__kernel_sigreturn; __kernel_sigreturn;
__kernel_rt_sigreturn; __kernel_rt_sigreturn;
local: *; local: *;
}; };
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment