lkml.org 
[lkml]   [2009]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/13] x86, vmlinux.lds: unify start/end of SECTIONS
    Date
    No functional changes.

    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Tim Abbott <tabbott@MIT.EDU>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    ---
    arch/x86/kernel/vmlinux.lds.S | 14 ++++++++++++++
    arch/x86/kernel/vmlinux_32.lds.S | 9 ---------
    arch/x86/kernel/vmlinux_64.lds.S | 9 ---------
    3 files changed, 14 insertions(+), 18 deletions(-)

    diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
    index fef1d8d..40f3439 100644
    --- a/arch/x86/kernel/vmlinux.lds.S
    +++ b/arch/x86/kernel/vmlinux.lds.S
    @@ -49,12 +49,26 @@ PHDRS {
    note PT_NOTE FLAGS(0); /* ___ */
    }

    +SECTIONS
    +{
    +#ifdef CONFIG_X86_32
    + . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
    + phys_startup_32 = startup_32 - LOAD_OFFSET;
    +#else
    + . = __START_KERNEL;
    + phys_startup_64 = startup_64 - LOAD_OFFSET;
    +#endif
    +
    #ifdef CONFIG_X86_32
    # include "vmlinux_32.lds.S"
    #else
    # include "vmlinux_64.lds.S"
    #endif

    + STABS_DEBUG
    + DWARF_DEBUG
    +}
    +

    #ifdef CONFIG_X86_32
    ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),
    diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
    index 4fd40dc..3d3d49c 100644
    --- a/arch/x86/kernel/vmlinux_32.lds.S
    +++ b/arch/x86/kernel/vmlinux_32.lds.S
    @@ -1,8 +1,3 @@
    -SECTIONS
    -{
    - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
    - phys_startup_32 = startup_32 - LOAD_OFFSET;
    -
    /* Text and read-only data */
    .text.head : AT(ADDR(.text.head) - LOAD_OFFSET) {
    _text = .;
    @@ -205,7 +200,3 @@ SECTIONS
    *(.exitcall.exit)
    *(.discard)
    }
    -
    - STABS_DEBUG
    - DWARF_DEBUG
    -}
    diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
    index 6e7cbee..2d7fa20 100644
    --- a/arch/x86/kernel/vmlinux_64.lds.S
    +++ b/arch/x86/kernel/vmlinux_64.lds.S
    @@ -1,8 +1,3 @@
    -SECTIONS
    -{
    - . = __START_KERNEL;
    - phys_startup_64 = startup_64 - LOAD_OFFSET;
    -
    /* Text and read-only data */
    .text : AT(ADDR(.text) - LOAD_OFFSET) {
    _text = .;
    @@ -277,7 +272,3 @@ SECTIONS
    *(.eh_frame)
    *(.discard)
    }
    -
    - STABS_DEBUG
    - DWARF_DEBUG
    -}
    --
    1.6.0.6


    \
     
     \ /
      Last update: 2009-04-29 09:49    [W:0.031 / U:90.476 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site