Commit 1a43be74 authored by Roland McGrath's avatar Roland McGrath Committed by Linus Torvalds

ia64 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 1e89a5e1
/* /*
* Linker script for gate DSO. The gate pages are an ELF shared object prelinked to its * Linker script for gate DSO. The gate pages are an ELF shared object
* virtual address, with only one read-only segment and one execute-only segment (both fit * prelinked to its virtual address, with only one read-only segment and
* in one page). This script controls its layout. * one execute-only segment (both fit in one page). This script controls
* its layout.
*/ */
...@@ -18,12 +19,14 @@ SECTIONS ...@@ -18,12 +19,14 @@ SECTIONS
.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) }
.dynamic : { *(.dynamic) } :readable :dynamic .dynamic : { *(.dynamic) } :readable :dynamic
/* /*
* This linker script is used both with -r and with -shared. For the layouts to match, * This linker script is used both with -r and with -shared. For
* we need to skip more than enough space for the dynamic symbol table et al. If this * the layouts to match, we need to skip more than enough space for
* amount is insufficient, ld -shared will barf. Just increase it here. * the dynamic symbol table et al. If this amount is insufficient,
* ld -shared will barf. Just increase it here.
*/ */
. = GATE_ADDR + 0x500; . = GATE_ADDR + 0x500;
...@@ -44,12 +47,13 @@ SECTIONS ...@@ -44,12 +47,13 @@ SECTIONS
*(.data.patch.brl_fsys_bubble_down) *(.data.patch.brl_fsys_bubble_down)
__end_gate_brl_fsys_bubble_down_patchlist = .; __end_gate_brl_fsys_bubble_down_patchlist = .;
} :readable } :readable
.IA_64.unwind_info : { *(.IA_64.unwind_info*) } .IA_64.unwind_info : { *(.IA_64.unwind_info*) }
.IA_64.unwind : { *(.IA_64.unwind*) } :readable :unwind .IA_64.unwind : { *(.IA_64.unwind*) } :readable :unwind
#ifdef HAVE_BUGGY_SEGREL #ifdef HAVE_BUGGY_SEGREL
.text (GATE_ADDR + PAGE_SIZE) : { *(.text) *(.text.*) } :readable .text (GATE_ADDR + PAGE_SIZE) : { *(.text) *(.text.*) } :readable
#else #else
. = ALIGN (PERCPU_PAGE_SIZE) + (. & (PERCPU_PAGE_SIZE - 1)); . = ALIGN(PERCPU_PAGE_SIZE) + (. & (PERCPU_PAGE_SIZE - 1));
.text : { *(.text) *(.text.*) } :epc .text : { *(.text) *(.text.*) } :epc
#endif #endif
...@@ -63,6 +67,11 @@ SECTIONS ...@@ -63,6 +67,11 @@ SECTIONS
} }
} }
/*
* ld does not recognize this name token; use the constant.
*/
#define PT_IA_64_UNWIND 0x70000001
/* /*
* 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.
...@@ -74,7 +83,7 @@ PHDRS ...@@ -74,7 +83,7 @@ PHDRS
epc PT_LOAD FILEHDR PHDRS FLAGS(1); /* PF_X */ epc PT_LOAD FILEHDR PHDRS FLAGS(1); /* PF_X */
#endif #endif
dynamic PT_DYNAMIC FLAGS(4); /* PF_R */ dynamic PT_DYNAMIC FLAGS(4); /* PF_R */
unwind 0x70000001; /* PT_IA_64_UNWIND, but ld doesn't match the name */ unwind PT_IA_64_UNWIND;
} }
/* /*
......
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