Solaris port updates from Chris Johns

Makefile.in

@@ -18,6 +18,8 @@ manext = 1
 mandir = @mandir@/man$(manext)
 program_prefix = @program_prefix@
 
+export bindir
+
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 

c/build-tools/eolstrip.c

@@ -197,7 +197,7 @@ process(char *arg)
     if ( buffer[ length ] != '\n' )
       error(ERR_ERRNO|ERR_FATAL, "Line %d too long in %s\n", line_number, arg);
 
-    while ( isspace( buffer[ length ] ) )
+    while ( isspace( (int) buffer[ length ] ) )
       buffer[ length-- ] = '\0';
 
     if ( test_only ) {

c/build-tools/packhex.c

@@ -478,7 +478,7 @@ int main(
     } while ( gets( inbuff ) != NULL );
 
 
-    exit( EXIT_SUCCESS );
+    return ( EXIT_SUCCESS );
 
 }
 

c/build-tools/src/eolstrip.c

@@ -197,7 +197,7 @@ process(char *arg)
     if ( buffer[ length ] != '\n' )
       error(ERR_ERRNO|ERR_FATAL, "Line %d too long in %s\n", line_number, arg);
 
-    while ( isspace( buffer[ length ] ) )
+    while ( isspace( (int) buffer[ length ] ) )
       buffer[ length-- ] = '\0';
 
     if ( test_only ) {

c/build-tools/src/packhex.c

@@ -478,7 +478,7 @@ int main(
     } while ( gets( inbuff ) != NULL );
 
 
-    exit( EXIT_SUCCESS );
+    return ( EXIT_SUCCESS );
 
 }
 

c/src/exec/libcsupport/src/__gettod.c

@@ -20,8 +20,8 @@
 #include <sys/reent.h>
 #endif
 
-#include <time.h>
 #include <sys/time.h>
+#include <time.h>
 
 #include <errno.h>
 #include <assert.h>

c/src/exec/libcsupport/src/error.c

@@ -142,10 +142,12 @@ static int rtems_verror(
         chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status));
 
     if (local_errno)
-	if ((local_errno > 0) && *strerror(local_errno))
+    {
-	    chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
+      if ((local_errno > 0) && *strerror(local_errno))
-	else
+        chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
-	    chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
+      else
+        chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
+    }
     
     chars_written += fprintf(stderr, "\n");
 

c/src/exec/score/cpu/unix/cpu.c

@@ -14,16 +14,6 @@
 #include <rtems/score/isr.h>
 #include <rtems/score/interr.h>
 
-#if defined(solaris2)
-/*
-#undef  _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 3
-#undef  __STRICT_ANSI__
-#define __STRICT_ANSI__
-*/
-#define __EXTENSIONS__
-#endif
-
 #if defined(__linux__)
 #define MALLOC_0_RETURNS_NULL
 #endif

c/src/exec/wrapup/rtems/Makefile.in

@@ -45,7 +45,7 @@ CLOBBER_ADDITIONS +=
 
 $(LIB): ${OBJS}
 	$(make-library)
-	cd $(PROJECT_ROOT) ; \
+	-cd $(PROJECT_ROOT) ; \
 	    $(PROJECT_RELEASE)/bin/size_rtems $(RTEMS_BSP) \
 		>$(PROJECT_RELEASE)/lib/sizeinfo.txt
 

c/src/lib/include/rtems++/rtemsInterrupt.h

@@ -71,7 +71,7 @@ protected:
   
 private:   
   const rtemsInterrupt& operator=(const rtemsInterrupt& );
-  Interrupt(const rtemsInterrupt& );
+  rtemsInterrupt(const rtemsInterrupt& );
   
   // the vector caught
   rtems_vector_number vector;

c/src/lib/libbsp/unix/posix/timer/timer.c

@@ -16,9 +16,6 @@
  *  $Id$
  */
 
-/* For solaris 2.4 */
-#define __EXTENSIONS__
-
 #include <bsp.h>
 #include <time.h>
 #include <sys/time.h>

c/src/lib/libc/__gettod.c

@@ -20,8 +20,8 @@
 #include <sys/reent.h>
 #endif
 
-#include <time.h>
 #include <sys/time.h>
+#include <time.h>
 
 #include <errno.h>
 #include <assert.h>

c/src/lib/libc/error.c

@@ -142,10 +142,12 @@ static int rtems_verror(
         chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status));
 
     if (local_errno)
-	if ((local_errno > 0) && *strerror(local_errno))
+    {
-	    chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
+      if ((local_errno > 0) && *strerror(local_errno))
-	else
+        chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
-	    chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
+      else
+        chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
+    }
     
     chars_written += fprintf(stderr, "\n");
 

c/src/lib/libmisc/error/error.c

@@ -142,10 +142,12 @@ static int rtems_verror(
         chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status));
 
     if (local_errno)
-	if ((local_errno > 0) && *strerror(local_errno))
+    {
-	    chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
+      if ((local_errno > 0) && *strerror(local_errno))
-	else
+        chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
-	    chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
+      else
+        chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
+    }
     
     chars_written += fprintf(stderr, "\n");
 

c/src/lib/libmisc/monitor/mon-symbols.c

@@ -11,17 +11,17 @@
  *  $Id$
  */
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+/* for strcasecmp in linux and solaris */
-#include <rtems.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-/* for strcasecmp in linux */
 #if defined(linux)
 #define __USE_BSD
 #endif
 #include <string.h>
 
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+#include <rtems.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <rtems/monitor.h>
 #include <rtems/symbols.h>
 

c/src/lib/librtems++/rtemsMessageQueue.cc

@@ -18,6 +18,7 @@
   ------------------------------------------------------------------------
 */
 
+#include <string.h>
 #include <rtems++/rtemsMessageQueue.h>
 
 /* ----

c/src/lib/librtems++/rtemsSemaphore.cc

@@ -18,6 +18,7 @@
   ------------------------------------------------------------------------
 */
 
+#include <string.h>
 #include <rtems++/rtemsSemaphore.h>
 
 /* ----

c/src/lib/librtems++/rtemsTask.cc

@@ -18,6 +18,7 @@
   ------------------------------------------------------------------------
 */
 
+#include <string.h>
 #include <rtems++/rtemsTask.h>
 // include to allow it to be compiled
 #include <rtems++/rtemsTaskMode.h>

c/src/lib/librtems++/rtemsTimer.cc

@@ -18,6 +18,7 @@
   ------------------------------------------------------------------------
 */
 
+#include <string.h>
 #include <rtems++/rtemsTimer.h>
 
 /* ----

c/src/libmisc/error/error.c

@@ -142,10 +142,12 @@ static int rtems_verror(
         chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status));
 
     if (local_errno)
-	if ((local_errno > 0) && *strerror(local_errno))
+    {
-	    chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
+      if ((local_errno > 0) && *strerror(local_errno))
-	else
+        chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
-	    chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
+      else
+        chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
+    }
     
     chars_written += fprintf(stderr, "\n");
 

c/src/libmisc/monitor/mon-symbols.c

@@ -11,17 +11,17 @@
  *  $Id$
  */
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+/* for strcasecmp in linux and solaris */
-#include <rtems.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-/* for strcasecmp in linux */
 #if defined(linux)
 #define __USE_BSD
 #endif
 #include <string.h>
 
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+#include <rtems.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <rtems/monitor.h>
 #include <rtems/symbols.h>
 

c/src/librtems++/include/rtems++/rtemsInterrupt.h

@@ -71,7 +71,7 @@ protected:
   
 private:   
   const rtemsInterrupt& operator=(const rtemsInterrupt& );
-  Interrupt(const rtemsInterrupt& );
+  rtemsInterrupt(const rtemsInterrupt& );
   
   // the vector caught
   rtems_vector_number vector;

c/src/librtems++/src/rtemsMessageQueue.cc

@@ -18,6 +18,7 @@
   ------------------------------------------------------------------------
 */
 
+#include <string.h>
 #include <rtems++/rtemsMessageQueue.h>
 
 /* ----

c/src/librtems++/src/rtemsSemaphore.cc

@@ -18,6 +18,7 @@
   ------------------------------------------------------------------------
 */
 
+#include <string.h>
 #include <rtems++/rtemsSemaphore.h>
 
 /* ----

c/src/librtems++/src/rtemsTask.cc

@@ -18,6 +18,7 @@
   ------------------------------------------------------------------------
 */
 
+#include <string.h>
 #include <rtems++/rtemsTask.h>
 // include to allow it to be compiled
 #include <rtems++/rtemsTaskMode.h>

c/src/librtems++/src/rtemsTimer.cc

@@ -18,6 +18,7 @@
   ------------------------------------------------------------------------
 */
 
+#include <string.h>
 #include <rtems++/rtemsTimer.h>
 
 /* ----

c/src/make/directory.cfg

@@ -38,6 +38,15 @@ $(RECURSE_TARGETS):
 else
 ifdef RECURSE_TARGETS
 $(RECURSE_TARGETS):
-	set -e; for subd in $(SUB_DIRS); do $(MAKE) -w -C $$subd $@; done
+	@$(ECHO) ; set -e ; \
+	if [ "$(SUB_DIRS)" != "" ] ; then \
+	  sdirs="$(SUB_DIRS)" ; \
+	else \
+	  sdirs="xxx" ; \
+	fi ; \
+	if [ "$$sdirs" != "xxx" ] ; then \
+	  for subd in $$sdirs; do $(MAKE) -w -C $$subd $@; done ;\
+	fi
 endif
 endif
+

c/src/tests/samples/cdtest/main.cc

@@ -21,6 +21,7 @@
 
 #include <rtems.h>
 #include <stdio.h>
+#include <stdlib.h>
 #ifdef RTEMS_TEST_IO_STREAM
 #include <iostream.h>
 #endif

c/src/tests/samples/paranoia/paranoia.c

@@ -154,6 +154,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#if defined(solaris2)
+#include <math.h>
+#endif
+
 /*
  * To compile this on host using only libm from newlib (and using host libc)
  * do:

cpukit/libcsupport/src/__gettod.c

@@ -20,8 +20,8 @@
 #include <sys/reent.h>
 #endif
 
-#include <time.h>
 #include <sys/time.h>
+#include <time.h>
 
 #include <errno.h>
 #include <assert.h>

cpukit/libcsupport/src/error.c

@@ -142,10 +142,12 @@ static int rtems_verror(
         chars_written += fprintf(stderr, " (status: %s)", rtems_status_text(status));
 
     if (local_errno)
-	if ((local_errno > 0) && *strerror(local_errno))
+    {
-	    chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
+      if ((local_errno > 0) && *strerror(local_errno))
-	else
+        chars_written += fprintf(stderr, " (errno: %s)", strerror(local_errno));
-	    chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
+      else
+        chars_written += fprintf(stderr, " (unknown errno=%d)", local_errno);
+    }
     
     chars_written += fprintf(stderr, "\n");
 

cpukit/libmisc/monitor/mon-symbols.c

@@ -11,17 +11,17 @@
  *  $Id$
  */
 
-#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+/* for strcasecmp in linux and solaris */
-#include <rtems.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-/* for strcasecmp in linux */
 #if defined(linux)
 #define __USE_BSD
 #endif
 #include <string.h>
 
+#define __RTEMS_VIOLATE_KERNEL_VISIBILITY__
+#include <rtems.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <rtems/monitor.h>
 #include <rtems/symbols.h>
 

cpukit/score/cpu/unix/cpu.c

@@ -14,16 +14,6 @@
 #include <rtems/score/isr.h>
 #include <rtems/score/interr.h>
 
-#if defined(solaris2)
-/*
-#undef  _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 3
-#undef  __STRICT_ANSI__
-#define __STRICT_ANSI__
-*/
-#define __EXTENSIONS__
-#endif
-
 #if defined(__linux__)
 #define MALLOC_0_RETURNS_NULL
 #endif

make/custom/Solaris-posix.cfg

@@ -41,11 +41,21 @@ CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-solaris2.cfg
 
 # Use the LIBC support for CYGNUS newlib
 # RTEMS_LIBC_DIR must already be set (by module file)
-RTEMS_USE_NEWLIB=yes
+RTEMS_USE_NEWLIB=no
+
+LIBC_LIBM=-lm
 
 # Define this to yes if C++ is included in the development environment
 # This requires that at least the GNU C++ compiler and libg++ be installed.
+ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
+HAS_CPLUSPLUS=yes
+# no standard C++ libs provided by default
+LIBCC_INCLUDE=$(GNUTOOLS)/include/g++
+CPLUS_LD_LIBS=-lstdc++
+CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
+else
 HAS_CPLUSPLUS=no
+endif
 
 # Define this to yes if this target supports multiprocessor environments.
 HAS_MP=yes

make/directory.cfg

@@ -38,6 +38,15 @@ $(RECURSE_TARGETS):
 else
 ifdef RECURSE_TARGETS
 $(RECURSE_TARGETS):
-	set -e; for subd in $(SUB_DIRS); do $(MAKE) -w -C $$subd $@; done
+	@$(ECHO) ; set -e ; \
+	if [ "$(SUB_DIRS)" != "" ] ; then \
+	  sdirs="$(SUB_DIRS)" ; \
+	else \
+	  sdirs="xxx" ; \
+	fi ; \
+	if [ "$$sdirs" != "xxx" ] ; then \
+	  for subd in $$sdirs; do $(MAKE) -w -C $$subd $@; done ;\
+	fi
 endif
 endif
+

testsuites/samples/cdtest/main.cc

@@ -21,6 +21,7 @@
 
 #include <rtems.h>
 #include <stdio.h>
+#include <stdlib.h>
 #ifdef RTEMS_TEST_IO_STREAM
 #include <iostream.h>
 #endif

testsuites/samples/paranoia/paranoia.c

@@ -154,6 +154,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#if defined(solaris2)
+#include <math.h>
+#endif
+
 /*
  * To compile this on host using only libm from newlib (and using host libc)
  * do:

tools/build/eolstrip.c

@@ -197,7 +197,7 @@ process(char *arg)
     if ( buffer[ length ] != '\n' )
       error(ERR_ERRNO|ERR_FATAL, "Line %d too long in %s\n", line_number, arg);
 
-    while ( isspace( buffer[ length ] ) )
+    while ( isspace( (int) buffer[ length ] ) )
       buffer[ length-- ] = '\0';
 
     if ( test_only ) {

tools/build/packhex.c

@@ -478,7 +478,7 @@ int main(
     } while ( gets( inbuff ) != NULL );
 
 
-    exit( EXIT_SUCCESS );
+    return ( EXIT_SUCCESS );
 
 }
 

tools/build/src/eolstrip.c

@@ -197,7 +197,7 @@ process(char *arg)
     if ( buffer[ length ] != '\n' )
       error(ERR_ERRNO|ERR_FATAL, "Line %d too long in %s\n", line_number, arg);
 
-    while ( isspace( buffer[ length ] ) )
+    while ( isspace( (int) buffer[ length ] ) )
       buffer[ length-- ] = '\0';
 
     if ( test_only ) {

tools/build/src/packhex.c

@@ -478,7 +478,7 @@ int main(
     } while ( gets( inbuff ) != NULL );
 
 
-    exit( EXIT_SUCCESS );
+    return ( EXIT_SUCCESS );
 
 }