From 07ce99e933afa42e93a55a34e732d6db9ef8c90c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Sep 2008 22:16:25 +0000 Subject: 2008-09-16 Joel Sherrill * Makefile.am, startup/linkcmds: Use top level shared bsp_get_work_area() implementation. --- c/src/lib/libbsp/m68k/csb360/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/csb360/Makefile.am | 2 +- c/src/lib/libbsp/m68k/csb360/startup/linkcmds | 14 +++++++------- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/gen68302/Makefile.am | 2 +- c/src/lib/libbsp/m68k/gen68302/startup/linkcmds | 8 ++++---- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/gen68340/Makefile.am | 2 +- c/src/lib/libbsp/m68k/gen68340/startup/linkcmds | 10 +++++----- c/src/lib/libbsp/m68k/idp/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/idp/Makefile.am | 2 +- c/src/lib/libbsp/m68k/idp/startup/linkcmds | 8 ++++---- c/src/lib/libbsp/m68k/mvme136/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/mvme136/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mvme136/startup/linkcmds | 8 ++++---- c/src/lib/libbsp/m68k/mvme147/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/mvme147/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mvme147/startup/linkcmds | 8 ++++---- c/src/lib/libbsp/m68k/mvme147s/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/mvme147s/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds | 8 ++++---- c/src/lib/libbsp/m68k/mvme162/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/mvme162/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mvme162/startup/linkcmds | 8 ++++---- c/src/lib/libbsp/m68k/mvme167/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/mvme167/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mvme167/startup/linkcmds | 8 ++++---- c/src/lib/libbsp/m68k/ods68302/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/ods68302/Makefile.am | 2 +- c/src/lib/libbsp/m68k/ods68302/startup/linkcmds | 8 ++++---- c/src/lib/libbsp/m68k/sim68000/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/sim68000/Makefile.am | 2 +- c/src/lib/libbsp/m68k/sim68000/startup/linkcmds | 8 ++++---- 33 files changed, 114 insertions(+), 59 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog index 8e0f0c29dd..61c9437894 100644 --- a/c/src/lib/libbsp/m68k/csb360/ChangeLog +++ b/c/src/lib/libbsp/m68k/csb360/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, startup/linkcmds: Add use of diff --git a/c/src/lib/libbsp/m68k/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am index 7a684e46fe..0bac9e8fe6 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.am +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am @@ -30,7 +30,7 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \ - ../../shared/bsppost.c ../../m68k/shared/m68kbspgetworkarea.c \ + ../../shared/bsppost.c ../../shared/bspgetworkarea.c \ ../../shared/bspstart.c startup/init5272.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c diff --git a/c/src/lib/libbsp/m68k/csb360/startup/linkcmds b/c/src/lib/libbsp/m68k/csb360/startup/linkcmds index ca07568914..8eaf63d082 100644 --- a/c/src/lib/libbsp/m68k/csb360/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/csb360/startup/linkcmds @@ -13,9 +13,9 @@ * A heap size of 0 means "Use all available memory for the heap". * Initial stack located in on-chip SRAM and not declared there. */ -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x00100000; -_RamSize = DEFINED(_RamSize) ? _RamSize : 31M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; +RamBase = DEFINED(RamBase) ? RamBase : 0x00100000; +RamSize = DEFINED(RamSize) ? RamSize : 31M; /* This is needed for _CPU_ISR_install_vector - * WARNING: it MUST match BSP_RAMBAR !!!!!!!!!!! */ @@ -40,8 +40,8 @@ SECTIONS */ .text : { - _RamBase = .; - __RamBase = .; + RamBase = .; + RamBase = .; CREATE_OBJECT_SYMBOLS *(.text*) @@ -133,8 +133,8 @@ SECTIONS clear_end = .; - _WorkspaceBase = .; - __WorkspaceBase = .; + WorkAreaBase = .; + WorkAreaBase = .; } > ram diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 09b8db27f1..d5ab13eceb 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, clock/ckinit.c, startup/linkcmds: Add use diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index 16ffab8c9d..7578ed8899 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.am @@ -31,7 +31,7 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \ ../../shared/bsppost.c ../../shared/bspstart.c ../../shared/bootcard.c \ - ../../m68k/shared/m68kbspgetworkarea.c ../../shared/sbrk.c \ + ../../shared/bspgetworkarea.c ../../shared/sbrk.c \ ../../m68k/shared/setvec.c ../../shared/gnatinstallhandler.c clock_SOURCES = clock/ckinit.c console_SOURCES = console/console.c ../../shared/dummy_printk_support.c diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds index f8b19c56cd..d3c6c71185 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds @@ -23,9 +23,9 @@ _VBR = 0x000000; /* location of the VBR table (in RAM) */ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; -_RamSize = DEFINED(_RamSize) ? _RamSize : 16M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +RamBase = DEFINED(RamBase) ? RamBase : 0x0; +RamSize = DEFINED(RamSize) ? RamSize : 16M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; SECTIONS @@ -139,7 +139,7 @@ SECTIONS _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } >ram /* Stabs debugging sections. */ diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index 6e30cea16c..3a93816f82 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, clock/ckinit.c, startup/linkcmds: Add use diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index 9a7d82cc2f..3fc9cee8c4 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -31,7 +31,7 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppredriverhook.c ../../m68k/shared/m68kbspgetworkarea.c \ + ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ ../../shared/bsppost.c ../../shared/bspstart.c startup/init68340.c \ ../../shared/bootcard.c ../../shared/bsppretaskinghook.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds index 8541a58e83..c713e7eb64 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds @@ -20,15 +20,15 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x10000000; -_RamSize = DEFINED(_RamSize) ? _RamSize : 4M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +RamBase = DEFINED(RamBase) ? RamBase : 0x10000000; +RamSize = DEFINED(RamSize) ? RamSize : 4M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; /* * Declare on-board memory. * It would be nice if the ram length could be given as - * LENGTH=_RamSize, but gld doesn't allow non-constant + * LENGTH=RamSize, but gld doesn't allow non-constant * values in the LENGTH expression. */ MEMORY { @@ -169,7 +169,7 @@ SECTIONS { _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } >ram /* diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index 381acd1945..ed4e054942 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, clock/ckinit.c, startup/bspstart.c, diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index eb09efe171..8cdc901a47 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -29,7 +29,7 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ - ../../shared/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \ + ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c clock_SOURCES = clock/ckinit.c diff --git a/c/src/lib/libbsp/m68k/idp/startup/linkcmds b/c/src/lib/libbsp/m68k/idp/startup/linkcmds index 07ae9b0af0..b6d74fcd71 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/idp/startup/linkcmds @@ -20,9 +20,9 @@ MEMORY /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; -_RamSize = DEFINED(_RamSize) ? _RamSize : 2M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +RamBase = DEFINED(RamBase) ? RamBase : 0x0; +RamSize = DEFINED(RamSize) ? RamSize : 2M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; SECTIONS @@ -136,7 +136,7 @@ SECTIONS _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } >ram /* Stabs debugging sections. */ diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index c515f62a7f..cff0687c54 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * Makefile.am, clock/ckinit.c, startup/bspstart.c, startup/linkcmds: diff --git a/c/src/lib/libbsp/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am index 4c7bb64c38..9604cdef3f 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am @@ -29,7 +29,7 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bootcard.c \ - ../../shared/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \ + ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c gnatsupp_SOURCES = ../../shared/gnatinstallhandler.c clock_SOURCES = clock/ckinit.c diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds index 08fe2b993a..2e949d548d 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme136/startup/linkcmds @@ -15,9 +15,9 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; -_RamSize = DEFINED(_RamSize) ? _RamSize : 1M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +RamBase = DEFINED(RamBase) ? RamBase : 0x0; +RamSize = DEFINED(RamSize) ? RamSize : 1M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; MEMORY @@ -136,7 +136,7 @@ SECTIONS _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } >ram /* Stabs debugging sections. */ diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index 3dc5f2d2d7..597cb95519 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, clock/ckinit.c, startup/bspstart.c, diff --git a/c/src/lib/libbsp/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index ca953026eb..272ee6f6f1 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/Makefile.am @@ -29,7 +29,7 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppretaskinghook.c ../../shared/bsppredriverhook.c \ - ../../m68k/shared/m68kbspgetworkarea.c ../../shared/sbrk.c \ + ../../shared/bspgetworkarea.c ../../shared/sbrk.c \ ../../m68k/shared/setvec.c ../../shared/gnatinstallhandler.c clock_SOURCES = clock/ckinit.c console_SOURCES = console/console.c ../../shared/dummy_printk_support.c diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme147/startup/linkcmds index 09940781f9..d6a45946da 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme147/startup/linkcmds @@ -19,10 +19,10 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; -_RamSize = DEFINED(_RamSize) ? _RamSize : 4M; +RamBase = DEFINED(RamBase) ? RamBase : 0x0; +RamSize = DEFINED(RamSize) ? RamSize : 4M; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; MEMORY { @@ -140,7 +140,7 @@ SECTIONS _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } >ram /* Stabs debugging sections. */ diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index f4bc048330..2b00b2a469 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds: Add diff --git a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 175e7306f4..885518aea2 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -30,7 +30,7 @@ startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppretaskinghook.c ../../m68k/shared/setvec.c \ - ../../m68k/shared/m68kbspgetworkarea.c ../../m68k/shared/setvec.c \ + ../../shared/bspgetworkarea.c ../../m68k/shared/setvec.c \ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c clock_SOURCES = ../mvme147/clock/ckinit.c console_SOURCES = ../mvme147/console/console.c \ diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds index fb8e14ef41..c4239f230c 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/linkcmds @@ -19,9 +19,9 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; -_RamSize = DEFINED(_RamSize) ? _RamSize : 4M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +RamBase = DEFINED(RamBase) ? RamBase : 0x0; +RamSize = DEFINED(RamSize) ? RamSize : 4M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; MEMORY @@ -140,7 +140,7 @@ SECTIONS _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } >ram /* Stabs debugging sections. */ diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog index ca07a55f5b..8011f2b570 100644 --- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, clock/ckinit.c, startup/bspstart.c, diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am index 3be807aa3e..bb7f0caef7 100644 --- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am @@ -39,7 +39,7 @@ startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bsppost.c \ startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppretaskinghook.c startup/page_table.c \ - ../../m68k/shared/m68kbspgetworkarea.c startup/page_table.c \ + ../../shared/bspgetworkarea.c startup/page_table.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c clock_SOURCES = clock/ckinit.c diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds index ae184def59..6c67471ca6 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme162/startup/linkcmds @@ -22,9 +22,9 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x20000; -_RamSize = DEFINED(_RamSize) ? _RamSize : 1M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +RamBase = DEFINED(RamBase) ? RamBase : 0x20000; +RamSize = DEFINED(RamSize) ? RamSize : 1M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; MEMORY @@ -143,7 +143,7 @@ SECTIONS _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } >ram /* Stabs debugging sections. */ diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 23194d5dbf..22332a981a 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, clock/ckinit.c, startup/bspstart.c: Add diff --git a/c/src/lib/libbsp/m68k/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index d758490a16..a4d71572bc 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -32,7 +32,7 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c \ - ../../m68k/shared/m68kbspgetworkarea.c \ + ../../shared/bspgetworkarea.c \ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/bsppretaskinghook.c startup/page_table.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/linkcmds b/c/src/lib/libbsp/m68k/mvme167/startup/linkcmds index 6f8e83e92a..2bb00544bf 100644 --- a/c/src/lib/libbsp/m68k/mvme167/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mvme167/startup/linkcmds @@ -24,9 +24,9 @@ ENTRY(_start) /* * Declare some sizes. Heap is sized at whatever ram space is left. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x00800000; -_RamSize = DEFINED(_RamSize) ? _RamSize : 4M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0; +RamBase = DEFINED(RamBase) ? RamBase : 0x00800000; +RamSize = DEFINED(RamSize) ? RamSize : 4M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; MEMORY @@ -152,7 +152,7 @@ SECTIONS _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } >ram /* Stabs debugging sections. */ diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index 5826b0aaf8..ed0f82a401 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, clock/ckinit.c, startup/linkcmds: Add use diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/Makefile.am index ad252fbd14..14b1f558d6 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am @@ -43,7 +43,7 @@ startup_SOURCES = startup/cpuboot.c startup/crc.c startup/debugport.c \ startup/gdb-hooks.c ../../shared/bootcard.c \ startup/m68302scc.c startup/m68k-stub.c \ ../../shared/bsppretaskinghook.c startup/memcheck.c \ - ../../m68k/shared/m68kbspgetworkarea.c startup/memcheck.c \ + ../../shared/bspgetworkarea.c startup/memcheck.c \ startup/trace.c ../../shared/gnatinstallhandler.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bsppost.c \ ../../shared/bspstart.c ../../shared/bspclean.c ../../shared/sbrk.c \ diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds b/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds index 5535563077..1ebac13e03 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds @@ -8,9 +8,9 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; -_RamSize = DEFINED(_RamSize) ? _RamSize : 1M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +RamBase = DEFINED(RamBase) ? RamBase : 0x0; +RamSize = DEFINED(RamSize) ? RamSize : 1M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; /* @@ -154,7 +154,7 @@ SECTIONS _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } >ram /* Stabs debugging sections. */ diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index ed0218ab58..6b7b7f1f95 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, startup/linkcmds: Add use of diff --git a/c/src/lib/libbsp/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am index 3bbb1b185e..f98ab99068 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.am @@ -29,7 +29,7 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bspstart.c ../../shared/bootcard.c \ startup/bsppredriverhook.c ../../shared/bsppretaskinghook.c \ - ../../m68k/shared/m68kbspgetworkarea.c ../../shared/sbrk.c \ + ../../shared/bspgetworkarea.c ../../shared/sbrk.c \ ../../m68k/shared/setvec.c ../../shared/gnatinstallhandler.c \ ../../m68k/shared/bspspuriousinit.c ../../m68k/shared/m68000spurious.c \ startup/spurious_assistant.c diff --git a/c/src/lib/libbsp/m68k/sim68000/startup/linkcmds b/c/src/lib/libbsp/m68k/sim68000/startup/linkcmds index 92a2e6ec74..b89980a8cf 100644 --- a/c/src/lib/libbsp/m68k/sim68000/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/sim68000/startup/linkcmds @@ -10,9 +10,9 @@ */ _RomBase = DEFINED(_RomBase) ? _RomBase : 0x0; _RomSize = DEFINED(_RomSize) ? _RomSize : 512K; -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x80000; -_RamSize = DEFINED(_RamSize) ? _RamSize : 128K; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0; +RamBase = DEFINED(RamBase) ? RamBase : 0x80000; +RamSize = DEFINED(RamSize) ? RamSize : 128K; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; /* @@ -133,7 +133,7 @@ SECTIONS _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } /* Stabs debugging sections. */ -- cgit v1.2.3