sh/shsim: Further clean up and fixes to previous commit

c/src/lib/libbsp/sh/shsim/Makefile.am

@@ -38,6 +38,7 @@ libbsp_a_SOURCES += ../../shared/bspclean.c
 libbsp_a_SOURCES += ../../shared/sbrk.c ../../shared/bootcard.c
 libbsp_a_SOURCES += ../../shared/gnatinstallhandler.c
 libbsp_a_SOURCES += ../shared/bsphwinit.c
+libbsp_a_SOURCES += startup/sysexit.c
 
 # clock
 libbsp_a_SOURCES += ../../shared/clock_driver_simidle.c

c/src/lib/libbsp/sh/shsim/include/bsp.h

@@ -56,7 +56,6 @@ extern void *CPU_Interrupt_stack_high;
 /*
  * BSP methods that cross file boundaries.
  */
-int __trap34(int, int, void*, int );
 int _sys_exit (int n);
 void bsp_hw_init(void);
 

c/src/lib/libbsp/sh/shsim/include/syscall.h

@@ -28,3 +28,5 @@
 
 #define SYS_utime       201 /* not really a system call */
 #define SYS_wait        202 /* nor is this */
+
+int __trap34(int, int, void*, int );

c/src/lib/libbsp/sh/shsim/startup/sysexit.c

@@ -12,8 +12,9 @@
  */
 
 #include <bsp.h>
+#include <bsp/syscall.h>
 
-extern int __trap34(int, int, void*, int );
+int errno; /* assumed to exist by exit_k() */
 
 int _sys_exit (int n)
 {