From a2e1dc3941bd11af6dbce139cdccb904794cbd7c Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sun, 3 Apr 2016 16:03:07 +0000
Subject: Modified path for ld files.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9237 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/common/startup/ARM/compilers/GCC/rules.mk       |   2 +-
 os/common/startup/ARMCMx/compilers/GCC/rules.mk    |   2 +-
 .../startup/ARMCMx/compilers/GCC/rules_ram.ld      | 357 ---------------------
 os/common/startup/e200/compilers/GCC/rules.mk      |   2 +-
 4 files changed, 3 insertions(+), 360 deletions(-)
 delete mode 100644 os/common/startup/ARMCMx/compilers/GCC/rules_ram.ld

(limited to 'os/common/startup')

diff --git a/os/common/startup/ARM/compilers/GCC/rules.mk b/os/common/startup/ARM/compilers/GCC/rules.mk
index b8f66a99e..b585a277f 100644
--- a/os/common/startup/ARM/compilers/GCC/rules.mk
+++ b/os/common/startup/ARM/compilers/GCC/rules.mk
@@ -124,7 +124,7 @@ ASFLAGS   = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.s=.lst)) $(ADEFS)
 ASXFLAGS  = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.S=.lst)) $(ADEFS)
 CFLAGS    = $(MCFLAGS) $(OPT) $(COPT) $(CWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.c=.lst)) $(DEFS)
 CPPFLAGS  = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cpp=.lst)) $(DEFS)
-LDFLAGS   = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH),--script=$(LDSCRIPT)$(LDOPT)
+LDFLAGS   = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH)/ld,--script=$(LDSCRIPT)$(LDOPT)
 
 # Thumb interwork enabled only if needed because it kills performance.
 ifneq ($(TSRC),)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/rules.mk b/os/common/startup/ARMCMx/compilers/GCC/rules.mk
index 5d64ec915..4ea7768ec 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/rules.mk
+++ b/os/common/startup/ARMCMx/compilers/GCC/rules.mk
@@ -115,7 +115,7 @@ ASFLAGS   = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.s=.lst)) $(ADEFS)
 ASXFLAGS  = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.S=.lst)) $(ADEFS)
 CFLAGS    = $(MCFLAGS) $(OPT) $(COPT) $(CWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.c=.lst)) $(DEFS)
 CPPFLAGS  = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cpp=.lst)) $(DEFS)
-LDFLAGS   = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH),--script=$(LDSCRIPT)$(LDOPT)
+LDFLAGS   = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH)/ld,--script=$(LDSCRIPT)$(LDOPT)
 
 # Thumb interwork enabled only if needed because it kills performance.
 ifneq ($(TSRC),)
diff --git a/os/common/startup/ARMCMx/compilers/GCC/rules_ram.ld b/os/common/startup/ARMCMx/compilers/GCC/rules_ram.ld
deleted file mode 100644
index 543a8608b..000000000
--- a/os/common/startup/ARMCMx/compilers/GCC/rules_ram.ld
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-__ram0_start__          = ORIGIN(ram0);
-__ram0_size__           = LENGTH(ram0);
-__ram0_end__            = __ram0_start__ + __ram0_size__;
-__ram1_start__          = ORIGIN(ram1);
-__ram1_size__           = LENGTH(ram1);
-__ram1_end__            = __ram1_start__ + __ram1_size__;
-__ram2_start__          = ORIGIN(ram2);
-__ram2_size__           = LENGTH(ram2);
-__ram2_end__            = __ram2_start__ + __ram2_size__;
-__ram3_start__          = ORIGIN(ram3);
-__ram3_size__           = LENGTH(ram3);
-__ram3_end__            = __ram3_start__ + __ram3_size__;
-__ram4_start__          = ORIGIN(ram4);
-__ram4_size__           = LENGTH(ram4);
-__ram4_end__            = __ram4_start__ + __ram4_size__;
-__ram5_start__          = ORIGIN(ram5);
-__ram5_size__           = LENGTH(ram5);
-__ram5_end__            = __ram5_start__ + __ram5_size__;
-__ram6_start__          = ORIGIN(ram6);
-__ram6_size__           = LENGTH(ram6);
-__ram6_end__            = __ram6_start__ + __ram6_size__;
-__ram7_start__          = ORIGIN(ram7);
-__ram7_size__           = LENGTH(ram7);
-__ram7_end__            = __ram7_start__ + __ram7_size__;
-
-ENTRY(Reset_Handler)
-
-SECTIONS
-{
-    . = 0;
-    _text = .;
-
-    startup : ALIGN(16) SUBALIGN(16)
-    {
-        KEEP(*(.vectors))
-    } > CODE_MEMORY
-
-    constructors : ALIGN(4) SUBALIGN(4)
-    {
-        __init_array_start = .;
-        KEEP(*(SORT(.init_array.*)))
-        KEEP(*(.init_array))
-        __init_array_end = .;
-    } > CODE_MEMORY
-
-    destructors : ALIGN(4) SUBALIGN(4)
-    {
-        __fini_array_start = .;
-        KEEP(*(.fini_array))
-        KEEP(*(SORT(.fini_array.*)))
-        __fini_array_end = .;
-    } > CODE_MEMORY
-
-    .text : ALIGN(16) SUBALIGN(16)
-    {
-        *(.text)
-        *(.text.*)
-        *(.rodata)
-        *(.rodata.*)
-        *(.glue_7t)
-        *(.glue_7)
-        *(.gcc*)
-    } > CODE_MEMORY
-
-    .ARM.extab :
-    {
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
-    } > CODE_MEMORY
-
-    .ARM.exidx : {
-        __exidx_start = .;
-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-        __exidx_end = .;
-     } > CODE_MEMORY
-
-    .eh_frame_hdr :
-    {
-        *(.eh_frame_hdr)
-    } > CODE_MEMORY
-
-    .eh_frame : ONLY_IF_RO
-    {
-        *(.eh_frame)
-    } > CODE_MEMORY
-
-    .textalign : ONLY_IF_RO
-    {
-        . = ALIGN(8);
-    } > CODE_MEMORY
-
-    /* Legacy symbol, not used anywhere.*/
-    . = ALIGN(4);
-    PROVIDE(_etext = .);
-
-    .data : ALIGN(4)
-    {
-        . = ALIGN(4);
-        PROVIDE(_data = .);
-        _data_start = .;
-        *(.data)
-        *(.data.*)
-        *(.ramtext)
-        . = ALIGN(4);
-        PROVIDE(_edata = .);
-        _data_end = .;
-    } > DATA_RAM
-
-    /* Special section for exceptions stack.*/
-    .mstack :
-    {
-        . = ALIGN(8);
-        __main_stack_base__ = .;
-        . += __main_stack_size__;
-        . = ALIGN(8);
-        __main_stack_end__ = .;
-    } > MAIN_STACK_RAM
-
-    /* Special section for process stack.*/
-    .pstack :
-    {
-        __process_stack_base__ = .;
-        __main_thread_stack_base__ = .;
-        . += __process_stack_size__;
-        . = ALIGN(8);
-        __process_stack_end__ = .;
-        __main_thread_stack_end__ = .;
-    } > PROCESS_STACK_RAM
-
-    .bss (NOLOAD) : ALIGN(4)
-    {
-        . = ALIGN(4);
-        _bss_start = .;
-        *(.bss)
-        *(.bss.*)
-        *(COMMON)
-        . = ALIGN(4);
-        _bss_end = .;
-        PROVIDE(end = .);
-    } > BSS_RAM
-
-    .ram0_init : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram0_init_text__ = LOADADDR(.ram0_init);
-        __ram0_init__ = .;
-        *(.ram0_init)
-        *(.ram0_init.*)
-        . = ALIGN(4);
-    } > ram0 AT > flash
-
-    .ram0 (NOLOAD) : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram0_clear__ = .;
-        *(.ram0_clear)
-        *(.ram0_clear.*)
-        . = ALIGN(4);
-        __ram0_noinit__ = .;
-        *(.ram0)
-        *(.ram0.*)
-        . = ALIGN(4);
-        __ram0_free__ = .;
-    } > ram0
-
-    .ram1_init : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram1_init_text__ = LOADADDR(.ram1_init);
-        __ram1_init__ = .;
-        *(.ram1_init)
-        *(.ram1_init.*)
-        . = ALIGN(4);
-    } > ram1 AT > flash
-
-    .ram1 (NOLOAD) : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram1_clear__ = .;
-        *(.ram1_clear)
-        *(.ram1_clear.*)
-        . = ALIGN(4);
-        __ram1_noinit__ = .;
-        *(.ram1)
-        *(.ram1.*)
-        . = ALIGN(4);
-        __ram1_free__ = .;
-    } > ram1
-
-    .ram2_init : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram2_init_text__ = LOADADDR(.ram2_init);
-        __ram2_init__ = .;
-        *(.ram2_init)
-        *(.ram2_init.*)
-        . = ALIGN(4);
-    } > ram2 AT > flash
-
-    .ram2 (NOLOAD) : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram2_clear__ = .;
-        *(.ram2_clear)
-        *(.ram2_clear.*)
-        . = ALIGN(4);
-        __ram2_noinit__ = .;
-        *(.ram2)
-        *(.ram2.*)
-        . = ALIGN(4);
-        __ram2_free__ = .;
-    } > ram2
-
-    .ram3_init : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram3_init_text__ = LOADADDR(.ram3_init);
-        __ram3_init__ = .;
-        *(.ram3_init)
-        *(.ram3_init.*)
-        . = ALIGN(4);
-    } > ram3 AT > flash
-
-    .ram3 (NOLOAD) : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram3_clear__ = .;
-        *(.ram3_clear)
-        *(.ram3_clear.*)
-        . = ALIGN(4);
-        __ram3_noinit__ = .;
-        *(.ram3)
-        *(.ram3.*)
-        . = ALIGN(4);
-        __ram3_free__ = .;
-    } > ram3
-
-    .ram4_init : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram4_init_text__ = LOADADDR(.ram4_init);
-        __ram4_init__ = .;
-        *(.ram4_init)
-        *(.ram4_init.*)
-        . = ALIGN(4);
-    } > ram4 AT > flash
-
-    .ram4 (NOLOAD) : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram4_clear__ = .;
-        *(.ram4_clear)
-        *(.ram4_clear.*)
-        . = ALIGN(4);
-        __ram4_noinit__ = .;
-        *(.ram4)
-        *(.ram4.*)
-        . = ALIGN(4);
-        __ram4_free__ = .;
-    } > ram4
-
-    .ram5_init : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram5_init_text__ = LOADADDR(.ram5_init);
-        __ram5_init__ = .;
-        *(.ram5_init)
-        *(.ram5_init.*)
-        . = ALIGN(4);
-    } > ram5 AT > flash
-
-    .ram5 (NOLOAD) : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram5_clear__ = .;
-        *(.ram5_clear)
-        *(.ram5_clear.*)
-        . = ALIGN(4);
-        __ram5_noinit__ = .;
-        *(.ram5)
-        *(.ram5.*)
-        . = ALIGN(4);
-        __ram5_free__ = .;
-    } > ram5
-
-    .ram6_init : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram6_init_text__ = LOADADDR(.ram6_init);
-        __ram6_init__ = .;
-        *(.ram6_init)
-        *(.ram6_init.*)
-        . = ALIGN(4);
-    } > ram6 AT > flash
-
-    .ram6 (NOLOAD) : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram6_clear__ = .;
-        *(.ram6_clear)
-        *(.ram6_clear.*)
-        . = ALIGN(4);
-        __ram6_noinit__ = .;
-        *(.ram6)
-        *(.ram6.*)
-        . = ALIGN(4);
-        __ram6_free__ = .;
-    } > ram6
-
-    .ram7_init : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram7_init_text__ = LOADADDR(.ram7_init);
-        __ram7_init__ = .;
-        *(.ram7_init)
-        *(.ram7_init.*)
-        . = ALIGN(4);
-    } > ram7 AT > flash
-
-    .ram7 (NOLOAD) : ALIGN(4)
-    {
-        . = ALIGN(4);
-        __ram7_clear__ = .;
-        *(.ram7_clear)
-        *(.ram7_clear.*)
-        . = ALIGN(4);
-        __ram7_noinit__ = .;
-        *(.ram7)
-        *(.ram7.*)
-        . = ALIGN(4);
-        __ram7_free__ = .;
-    } > ram7
-
-    /* The default heap uses the (statically) unused part of a RAM section.*/
-    .heap (NOLOAD) :
-    {
-        . = ALIGN(8);
-        __heap_base__ = .;
-        . = ORIGIN(HEAP_RAM) + LENGTH(HEAP_RAM);
-        __heap_end__ = .;
-    } > HEAP_RAM
-}
diff --git a/os/common/startup/e200/compilers/GCC/rules.mk b/os/common/startup/e200/compilers/GCC/rules.mk
index c7f9d9b03..9e5fd8fb8 100644
--- a/os/common/startup/e200/compilers/GCC/rules.mk
+++ b/os/common/startup/e200/compilers/GCC/rules.mk
@@ -96,7 +96,7 @@ ASFLAGS   = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.s=.lst)) $(ADEFS)
 ASXFLAGS  = $(MCFLAGS) -Wa,-amhls=$(LSTDIR)/$(notdir $(<:.S=.lst)) $(ADEFS)
 CFLAGS    = $(MCFLAGS) $(OPT) $(COPT) $(CWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.c=.lst)) $(DEFS)
 CPPFLAGS  = $(MCFLAGS) $(OPT) $(CPPOPT) $(CPPWARN) -Wa,-alms=$(LSTDIR)/$(notdir $(<:.cpp=.lst)) $(DEFS)
-LDFLAGS   = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH),$(LDOPT),--script=$(LDSCRIPT)
+LDFLAGS   = $(MCFLAGS) $(OPT) -nostartfiles $(LLIBDIR) -Wl,-Map=$(BUILDDIR)/$(PROJECT).map,--cref,--no-warn-mismatch,--library-path=$(RULESPATH)/ld,$(LDOPT),--script=$(LDSCRIPT)
 
 # Generate dependency information
 ASFLAGS  += -MD -MP -MF .dep/$(@F).d
-- 
cgit v1.2.3