[rtems commit] bsp/psim: Use plain symbol for PSIM

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    40ce26534eb88b4fb91b207ed76f044764f391f9
Changeset: http://git.rtems.org/rtems/commit/?id=40ce26534eb88b4fb91b207ed76f044764f391f9

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Jun 28 15:05:30 2013 +0200

bsp/psim: Use plain symbol for PSIM

This avoids a linker assertion failure in the GCC test suite.

---

 c/src/lib/libbsp/powerpc/psim/Makefile.am          |    3 +--
 c/src/lib/libbsp/powerpc/psim/startup/linkcmds     |   13 +------------
 .../libbsp/powerpc/psim/startup/psim_registers.c   |   13 -------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index a209a33..26c1940 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -36,8 +36,7 @@ libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \
     ../../shared/bsppost.c ../../shared/bsppretaskinghook.c \
     ../../shared/bsppredriverhook.c startup/bspstart.c \
     ../../shared/bspgetworkarea.c ../../shared/bootcard.c \
-    ../../powerpc/shared/startup/sbrk.c ../../shared/gnatinstallhandler.c \
-    startup/psim_registers.c
+    ../../powerpc/shared/startup/sbrk.c ../../shared/gnatinstallhandler.c
 
 # pclock
 libbsp_a_SOURCES += ../shared/clock/p_clock.c
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/linkcmds b/c/src/lib/libbsp/powerpc/psim/startup/linkcmds
index f9bdce7..5d2a2b7 100644
--- a/c/src/lib/libbsp/powerpc/psim/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/psim/startup/linkcmds
@@ -9,7 +9,6 @@
 
 MEMORY {
 	RAM       : ORIGIN = 0, LENGTH = 16M
-	PSIM_REGS : ORIGIN = 0x0c000000, LENGTH = 16M
 	EMPTY     : ORIGIN = 0x0, LENGTH = 0
 }
 
@@ -34,16 +33,6 @@ REGION_ALIAS ("REGION_NVRAM", EMPTY);
 
 PROVIDE (PSIM_INSTRUCTIONS_PER_MICROSECOND = 10000);
 
-SECTIONS {
-	/*
-	 * BSP: PSIM Register Block
-	 */
-	.psim_regs (NOLOAD) : {
-		psim_reg*(.text)
-		psim_reg*(.data)
-		psim_reg*(.bss)
-		psim_reg*(COMMON)
-	} > PSIM_REGS
-}
+PSIM = 0x0c000000;
 
 INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/psim_registers.c b/c/src/lib/libbsp/powerpc/psim/startup/psim_registers.c
deleted file mode 100644
index 894f1de..0000000
--- a/c/src/lib/libbsp/powerpc/psim/startup/psim_registers.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *  COPYRIGHT (c) 1989-2008.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- */
-
-#include <bsp.h>
-#include <psim.h>
-
-psim_registers_t PSIM;