All RTEMS system call implementation renamed to be __rtems_*.

2 files changed, 42 insertions, 4 deletions

diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
index e8faaa2904..6d870a22a6 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
@@ -86,7 +86,7 @@ void bsp_libc_init()
 
     /*
      *  Init the RTEMS libio facility to provide UNIX-like system
-     *  calls for use by newlib (ie: provide __open, __close, etc)
+     *  calls for use by newlib (ie: provide __rtems_open, __rtems_close, etc)
      *  Uses malloc() to get area for the iops, so must be after malloc init
      */
 
@@ -153,13 +153,13 @@ bsp_postdriver_hook(void)
  
   error_code = 'S' << 24 | 'T' << 16;
  
-  if ((stdin_fd = __open("/dev/console", O_RDONLY, 0)) == -1)
+  if ((stdin_fd = __rtems_open("/dev/console", O_RDONLY, 0)) == -1)
     rtems_fatal_error_occurred( error_code | 'D' << 8 | '0' );
  
-  if ((stdout_fd = __open("/dev/console", O_WRONLY, 0)) == -1)
+  if ((stdout_fd = __rtems_open("/dev/console", O_WRONLY, 0)) == -1)
     rtems_fatal_error_occurred( error_code | 'D' << 8 | '1' );
  
-  if ((stderr_fd = __open("/dev/console", O_WRONLY, 0)) == -1)
+  if ((stderr_fd = __rtems_open("/dev/console", O_WRONLY, 0)) == -1)
     rtems_fatal_error_occurred( error_code | 'D' << 8 | '2' );
  
   if ((stdin_fd != 0) || (stdout_fd != 1) || (stderr_fd != 2))
diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/linkcmds b/c/src/lib/libbsp/powerpc/papyrus/startup/linkcmds
index df1997639f..00bf4c6876 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/papyrus/startup/linkcmds
@@ -21,6 +21,23 @@ MEMORY
  
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
+
+/* What are these for? */
+
+__EXCEPT_START__ = 0;
+__EXCEPT_END__ = 0;
+__SDATA2_START__ = 0;
+__SDATA2_END__ = 0;
+__SBSS2_START__ = 0;
+__SBSS2_END__ = 0;
+__FIXUP_START__ = 0;
+__FIXUP_END__ = 0;
+__GOT2_START__ = 0;
+__GOT2_END__ = 0;
+__SDATA_START__ = 0;
+__SDATA_END__ = 0;
+
+
 SECTIONS
 {
   .vectors 0x0100 :
@@ -37,6 +54,23 @@ SECTIONS
      *(.rodata1)
      *(.descriptors)
      *(rom_ver)
+     etext = ALIGN(0x10);
+     _etext = .;
+     __CTOR_LIST__ = .;
+     LONG((__CTOR_END__ - __CTOR_LIST__) / 4 - 2)
+     *(.ctors)
+     LONG(0)
+     __CTOR_END__ = .;
+     __DTOR_LIST__ = .;
+     LONG((__DTOR_END__ - __DTOR_LIST__) / 4 - 2)
+     *(.dtors)
+     LONG(0)
+     __DTOR_END__ = .;
+     *(.lit)
+     *(.shdata)
+     *(.init)
+     *(.fini)
+     _endtext = .;
   } > RAM
  
   /* R/W Data */
@@ -46,18 +80,22 @@ SECTIONS
     *(.data1)
   } > RAM
  
+  __GOT_START__ = .;
   .got :
   {
      s.got = .;
      *(.got.plt) *(.got)
   } > RAM
+  __GOT_END__ = .;
  
+  __SBSS_START__ = .;
   .bss :
   {
     bss.start = .;
     *(.bss) *(.sbss) *(COMMON)
     bss.end = ALIGN(4);
   } > RAM
+  __SBSS_END__ = .;
  
   bss.size = bss.end - bss.start;
   PROVIDE(_end = bss.end);