2010-06-17 Joel Sherrill <joel.sherrill@oarcorp.com>

	* bit_all_bsps, bit_rtems, common.sh: Update to 4.11 and add sparc64.

4 files changed, 45 insertions, 23 deletions

diff --git a/rtems/ChangeLog b/rtems/ChangeLog
index aa13af2..8f26b6d 100644
--- a/rtems/ChangeLog
+++ b/rtems/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-17	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* bit_all_bsps, bit_rtems, common.sh: Update to 4.11 and add sparc64.
+
 2010-05-11	Joel Sherrill <joel.sherrilL@OARcorp.com>
 
 	* bit_ALL, bit_all_multilib: Merge updates.
diff --git a/rtems/bit_all_bsps b/rtems/bit_all_bsps
index 9527357..49c5f97 100755
--- a/rtems/bit_all_bsps
+++ b/rtems/bit_all_bsps
@@ -37,7 +37,7 @@ if [ $# -ne 0 ] ; then
   CPUS=$*
 else
   # leave out nios2 tic4x
-  CPUS="arm avr bfin h8300 i386 lm32 m32c m32r m68k mips powerpc sh sparc"
+  CPUS="arm avr bfin h8300 i386 lm32 m32c m32r m68k mips powerpc sh sparc sparc64"
 fi
 
 # we collect the ticker executables for users to try out
@@ -92,6 +92,7 @@ get_bsps()
       sh)      ALL_BSPS="gensh1 gensh2 gensh4"
 	       ALL_BSPS="${ALL_BSPS} simsh1 simsh2 simsh4" ;;
       sparc)   ALL_BSPS="sis erc32 leon2 leon3" ;;
+      sparc64) ALL_BSPS="usiii niagara" ;;
       tic4x)   ALL_BSPS="c3xsim c4xsim" ;;
       unix)    ALL_BSPS="posix"
 
diff --git a/rtems/bit_rtems b/rtems/bit_rtems
index f43af44..594a503 100755
--- a/rtems/bit_rtems
+++ b/rtems/bit_rtems
@@ -114,6 +114,7 @@ if [ x${BSP_TO_TEST} != x ] ; then
       bf537Stamp) ENABLE_BSP="${ENABLE_BSP} BFIN_ON_SKYEYE=1" ;;
       eZKit533)   ENABLE_BSP="${ENABLE_BSP} BFIN_ON_SKYEYE=1"   ;;
       edb7312)    ENABLE_BSP="${ENABLE_BSP} ON_SKYEYE=1" ;;
+      leon3)      ENABLE_BSP="${ENABLE_BSP}" ;;
       gumstix)    ENABLE_BSP="${ENABLE_BSP} ON_SKYEYE=1" ;;
       lm32_evr)   ENABLE_BSP="${ENABLE_BSP} ON_SIMULATOR=1" ;;
       csb637)
@@ -266,7 +267,7 @@ fi
 if [ ${ENABLE_RTEMS_TCPIP} = yes ] ; then
   case ${CPU} in
     avr) TCPIP_FLAG="--disable-networking" ;;
-    *)   TCPIP_FLAG="--enable-networking" ;;
+    *)   TCPIP_FLAG="--enable-networking --enable-shttpd" ;;
   esac
 else
   TCPIP_FLAG="--disable-networking"
@@ -320,12 +321,17 @@ else
   ENABLE_MP_FLAG="--disable-multiprocessing"
 fi
 
+if [ ${ENABLE_RTEMS_SMP} = yes ] ; then
+  ENABLE_SMP_FLAG="--enable-smp"
+else
+  ENABLE_SMP_FLAG="--disable-smp"
+fi
+
 # Some CPUs do not have C++ support
 if [ ${ENABLE_RTEMS_CXX} = yes ] ; then
   case ${CPU} in
-    avr|bfin|m32c|m32r|tic4x)
-       ENABLE_RTEMS_CXX="--disable-cxx" ;;
-    *) ENABLE_RTEMS_CXX="--enable-cxx" ;;
+    avr|bfin|tic4x) ENABLE_RTEMS_CXX="--disable-cxx" ;;
+    *)              ENABLE_RTEMS_CXX="--enable-cxx" ;;
   esac
 else
   ENABLE_RTEMS_CXX="--disable-cxx"
@@ -353,7 +359,7 @@ fi
 
 ENABLE_ARGS="\
     --prefix=${INSTALL_POINT} \
-    ${DISABLE_INLINES_FLAG} ${ENABLE_MP_FLAG} \
+    ${DISABLE_INLINES_FLAG} ${ENABLE_MP_FLAG} ${ENABLE_SMP_FLAG} \
     ${ENABLE_RTEMS_DEBUG} ${ENABLE_RTEMS_CXX} \
     ${ENABLE_RTEMS_RDBG} ${ENABLE_RTEMS_MAINTAINER_MODE} \
     ${RTEMS_TESTS_FLAG} ${TCPIP_FLAG} \
@@ -483,12 +489,14 @@ if [ ${ENABLE_RTEMS_TESTS} = "samples" -o \
 
   if [ ${RUN_RTEMS_TESTS} = yes ] ; then
     case ${BSP_TO_TEST} in
-      edb7312) testable=yes ;;  # arm/edb7312
-      rtl22xx) testable=yes ;;  # arm/rtl22xx
-      jmr3904) testable=yes ;;  # mips/jmr3904
-      psim)    testable=yes ;;  # powerpc/psim
-      sis)     testable=yes ;;  # sparc/sis
-      erc32|leon2|leon3)        # sparc using tsim
+      edb7312)  testable=yes ;;  # arm/edb7312
+      rtl22xx)  testable=yes ;;  # arm/rtl22xx
+      pc386)    testable=yes ;;  # i386/pc386
+      lm32_evr) testable=yes ;;  # lm32/lm32_evr
+      jmr3904)  testable=yes ;;  # mips/jmr3904
+      psim)     testable=yes ;;  # powerpc/psim
+      sis)      testable=yes ;;  # sparc/sis
+      erc32|leon2|leon3)         # sparc using tsim
         case `uname -n` in
           england*|iceland*) testable=yes ;; 
           *)                 testable=no ;;
@@ -502,11 +510,17 @@ if [ ${ENABLE_RTEMS_TESTS} = "samples" -o \
     testable=no
   fi
 
+  # This should run the tests
+  case ${BSP_TO_TEST} in
+    pc386) EXEEXT=exe ;;
+    *)     EXEEXT=ralf ;;
+  esac
+
   # If not multilib, grab the ticker.ralf and save it out
   if [ X${BSP_TO_TEST} != X ] ; then
     mkdir -p ../ticker-executables
-    cp `find . -name ticker.ralf` \
-        ../ticker-executables/${CPU}-${BSP_TO_TEST}-ticker.ralf
+    cp `find . -name ticker.${EXEEXT}` \
+        ../ticker-executables/${CPU}-${BSP_TO_TEST}-ticker.${EXEEXT}
   fi
 
   if [ ${testable} = yes ] ; then
@@ -516,21 +530,23 @@ if [ ${ENABLE_RTEMS_TESTS} = "samples" -o \
 
     mkdir ${testdir}
     check_fatal $? "failed to mkdir test directory for ${BSP_TO_TEST}."
-    cp `find . -name "*.ralf"` ${testdir}
+    cp `find . -name "*.${EXEEXT}"` ${testdir}
 
     case ${BSP_TO_TEST} in
-      jmr3904)  running=jmr3904 ;;
-      psim)     running=psim ;;
-      posix)    running="" ;;
+      jmr3904)  runner=jmr3904 ;;
+      psim)     runner=psim ;;
+      posix)    runner="" ;;
       # ARM
       edb7312)  runner=edb7312 ;;
       gumstix)  runner=gumstix ;;
       rtl22xx)  runner=rtl22xx ;;
+      # i386
+      pc386)    runner=pc386 ;;
       # SPARC
       erc32)    runner=erc32 ;;
       leon2)    runner=leon  ;;
       leon3)    runner=leon3 ;;
-      sis)      running=sis ;;
+      sis)      runner=sis ;;
       *) ;;
     esac
 
@@ -538,7 +554,7 @@ if [ ${ENABLE_RTEMS_TESTS} = "samples" -o \
     check_fatal $? "failed to enter test directory for ${BSP_TO_TEST}."
 
     # This should run the tests
-    ${runner} *.ralf
+    ${runner} *.${EXEEXT}
 
     # Check Logs
     echo "Checking Logs for Proper Test Completion ..."
diff --git a/rtems/common.sh b/rtems/common.sh
index e8b5cd8..1aacab9 100755
--- a/rtems/common.sh
+++ b/rtems/common.sh
@@ -39,7 +39,7 @@ print_rtems_cpus()
   echo "CPU is one of the following: "
   echo "  arm           h8300		i386		lm32"
   echo "  m68k		nios2		powerpc		sh"
-  echo "  m32c		m32r            sparc		tic4x"
+  echo "  m32c		m32r            sparc		sparc64    tic4x"
   echo 
   echo "Formats without a -XXX suffix are the preferred target."
   echo 
@@ -57,6 +57,7 @@ print_rtems_cpus()
   echo "    powerpc-rtems     -- IBM and Motorola PowerPC"
   echo "    sh-rtems          -- Renesas SH (COFF)"
   echo "    sparc-rtems       -- SPARC (ELF)"
+  echo "    sparc64-rtems     -- SPARC64 (ELF)"
 }
 
 # CPU must be set before we run any of this stuff
@@ -86,6 +87,7 @@ case ${CPU} in
   sh)          ;;
   tic4x)       ;;
   sparc)       ;;
+  sparc64)     ;;
   native)      CPU=unix;;
   unix)        ;;
   *)  
@@ -97,8 +99,7 @@ case ${CPU} in
 esac
  
 # insert the os version
-#target=`echo $target | sed -e 's/-rtems$/-rtems4.9/' -e 's/-rtemself$/-rtemself4.9/'`
-target=`echo $target | sed -e 's/-rtems$/-rtems4.10/' -e 's/-rtemself$/-rtemself4.10/'`
+target=`echo $target | sed -e 's/-rtems$/-rtems4.11/' -e 's/-rtemself$/-rtemself4.11/'`
 
 #
 #  Figure out if GNU make is available