Per request from Chris Johns <ccj@acm.org>, I added code to detect

when the bare bsp was enabled without setting both --enable-cpu-model
and --enable-cpu-cflags.

3 files changed, 50 insertions, 30 deletions

diff --git a/c/PROBLEMS b/c/PROBLEMS
index 869c941374..05f61f05cd 100644
--- a/c/PROBLEMS
+++ b/c/PROBLEMS
@@ -43,7 +43,9 @@ This is the list of outstanding problems in this release.
 +   Some of the tests may execute correctly and not produce the exact
     ordering of lines in the screen file.  This appears to be a combination
     of a number of factors including buffering, processor speed, IO
-    device overhead, and clock interrupt rate.
+    device overhead, and clock interrupt rate.  The biggest problem is that
+    some tests depend on polled IO with no unexpected context switches.
+    These may not be resolvable while maintaining the spirit of the test.
 
 +   The clock device drivers should really avoid doing the division
     by 1000 in the clock tick ISR to convert microseconds into
@@ -55,5 +57,3 @@ This is the list of outstanding problems in this release.
    + warn/refuse to configure when --enable-libcdir and
      --enable-gcc28 are given.
    + force --enable-libcdir when --disable-gcc28 is given
-   + Check for bare bsp getting CPU model set.
-
diff --git a/configure b/configure
index b45a27a362..0a569872be 100644
--- a/configure
+++ b/configure
@@ -2987,8 +2987,18 @@ echo "configure:2948: checking for bsps" >&5
     # Is there code where there should be for this BSP?
     # The bare bsp is a special case as it is not under the target_cpu path
     case $i in
-      bare)    bspcpudir= ;;
-      *)       bspcpudir=$target_cpu/ ;;
+      bare)
+        bspcpudir=
+        if test "X${BARE_CPU_CFLAGS}" = "X" ; then
+          { echo "configure: error: --enable-bare-cpu-flags not specified for bare bsp" 1>&2; exit 1; }
+        fi
+        if test "X${BARE_CPU_MODEL}" = "X" ; then
+          { echo "configure: error: --enable-bare-cpu-model not specified for bare bsp" 1>&2; exit 1; }
+        fi
+        ;;
+      *)
+        bspcpudir=$target_cpu/
+        ;;
     esac
      
     if test -d "$srcdir/c/src/lib/libbsp/$bspcpudir$bspdir"; then
@@ -2999,7 +3009,7 @@ echo "configure:2948: checking for bsps" >&5
         bspdirs="$bspdirs $bspdir"
         
 echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir""... $ac_c" 1>&6
-echo "configure:3003: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5
+echo "configure:3013: checking for Makefile.in in c/src/lib/libbsp/$bspcpudir$bspdir" >&5
 if test -d $srcdir/c/src/lib/libbsp/$bspcpudir$bspdir; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3014,7 +3024,7 @@ fi
 
         
 echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared""... $ac_c" 1>&6
-echo "configure:3018: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5
+echo "configure:3028: checking for Makefile.in in c/src/lib/libbsp/${bspcpudir}shared" >&5
 if test -d $srcdir/c/src/lib/libbsp/${bspcpudir}shared; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3037,7 +3047,7 @@ fi
 # find all the CPU dependent library Makefiles
 
 echo $ac_n "checking for Makefile.in in c/src/lib/libcpu/$target_cpu""... $ac_c" 1>&6
-echo "configure:3041: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
+echo "configure:3051: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
 if test -d $srcdir/c/src/lib/libcpu/$target_cpu; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3054,7 +3064,7 @@ fi
 if test "$skip_startfiles" != "yes"; then
   
 echo $ac_n "checking for Makefile.in in c/src/lib/start/$target_cpu""... $ac_c" 1>&6
-echo "configure:3058: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
+echo "configure:3068: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
 if test -d $srcdir/c/src/lib/start/$target_cpu; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3096,7 +3106,7 @@ fi
 
 # If the tests are enabled, then find all the test suite Makefiles
 echo $ac_n "checking if the test suites are enabled? ""... $ac_c" 1>&6
-echo "configure:3100: checking if the test suites are enabled? " >&5
+echo "configure:3110: checking if the test suites are enabled? " >&5
 tests_enabled=yes
 # Check whether --enable-tests or --disable-tests was given.
 if test "${enable_tests+set}" = set; then
@@ -3115,7 +3125,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6
-echo "configure:3119: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
+echo "configure:3129: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
 if test -d $srcdir/c/src/tests/tools/$target_cpu; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3132,7 +3142,7 @@ fi
 if test "$tests_enabled" = "yes"; then
    
 echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6
-echo "configure:3136: checking for Makefile.in in c/src/tests/libtests" >&5
+echo "configure:3146: checking for Makefile.in in c/src/tests/libtests" >&5
 if test -d $srcdir/c/src/tests/libtests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3147,7 +3157,7 @@ fi
 
    
 echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6
-echo "configure:3151: checking for Makefile.in in c/src/tests/sptests" >&5
+echo "configure:3161: checking for Makefile.in in c/src/tests/sptests" >&5
 if test -d $srcdir/c/src/tests/sptests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3162,7 +3172,7 @@ fi
 
    
 echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6
-echo "configure:3166: checking for Makefile.in in c/src/tests/tmtests" >&5
+echo "configure:3176: checking for Makefile.in in c/src/tests/tmtests" >&5
 if test -d $srcdir/c/src/tests/tmtests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3177,7 +3187,7 @@ fi
 
    
 echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6
-echo "configure:3181: checking for Makefile.in in c/src/tests/mptests" >&5
+echo "configure:3191: checking for Makefile.in in c/src/tests/mptests" >&5
 if test -d $srcdir/c/src/tests/mptests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3193,7 +3203,7 @@ fi
    if test "$RTEMS_HAS_POSIX_API" = "yes"; then
      
 echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6
-echo "configure:3197: checking for Makefile.in in c/src/tests/psxtests" >&5
+echo "configure:3207: checking for Makefile.in in c/src/tests/psxtests" >&5
 if test -d $srcdir/c/src/tests/psxtests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3211,7 +3221,7 @@ fi
 
 # If the HWAPI is enabled, the find the HWAPI Makefiles
 echo $ac_n "checking if the HWAPI is enabled? ""... $ac_c" 1>&6
-echo "configure:3215: checking if the HWAPI is enabled? " >&5
+echo "configure:3225: checking if the HWAPI is enabled? " >&5
 # Check whether --enable-hwapi or --disable-hwapi was given.
 if test "${enable_hwapi+set}" = set; then
   enableval="$enable_hwapi"
@@ -3222,7 +3232,7 @@ if test "${enable_hwapi+set}" = set; then
             makefiles="$makefiles c/src/lib/libhwapi/Makefile"
             
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/analog""... $ac_c" 1>&6
-echo "configure:3226: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
+echo "configure:3236: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
 if test -d $srcdir/c/src/lib/libhwapi/analog; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3237,7 +3247,7 @@ fi
 
             
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/discrete""... $ac_c" 1>&6
-echo "configure:3241: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
+echo "configure:3251: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
 if test -d $srcdir/c/src/lib/libhwapi/discrete; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3252,7 +3262,7 @@ fi
 
             
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/drivers""... $ac_c" 1>&6
-echo "configure:3256: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
+echo "configure:3266: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
 if test -d $srcdir/c/src/lib/libhwapi/drivers; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3267,7 +3277,7 @@ fi
 
             
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory""... $ac_c" 1>&6
-echo "configure:3271: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
+echo "configure:3281: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
 if test -d $srcdir/c/src/lib/libhwapi/non_volatile_memory; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3282,7 +3292,7 @@ fi
 
             
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/serial""... $ac_c" 1>&6
-echo "configure:3286: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
+echo "configure:3296: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
 if test -d $srcdir/c/src/lib/libhwapi/serial; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3297,7 +3307,7 @@ fi
 
             
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/support""... $ac_c" 1>&6
-echo "configure:3301: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
+echo "configure:3311: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
 if test -d $srcdir/c/src/lib/libhwapi/support; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3312,7 +3322,7 @@ fi
 
             
 echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/wrapup""... $ac_c" 1>&6
-echo "configure:3316: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
+echo "configure:3326: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
 if test -d $srcdir/c/src/lib/libhwapi/wrapup; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3357,7 +3367,7 @@ fi
 # pick up all the Makefiles in required parts of the tree
 
 echo $ac_n "checking for Makefile.in in c/build-tools""... $ac_c" 1>&6
-echo "configure:3361: checking for Makefile.in in c/build-tools" >&5
+echo "configure:3371: checking for Makefile.in in c/build-tools" >&5
 if test -d $srcdir/c/build-tools; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3372,7 +3382,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6
-echo "configure:3376: checking for Makefile.in in make" >&5
+echo "configure:3386: checking for Makefile.in in make" >&5
 if test -d $srcdir/make; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3387,7 +3397,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6
-echo "configure:3391: checking for Makefile.in in c/src/lib/libmisc" >&5
+echo "configure:3401: checking for Makefile.in in c/src/lib/libmisc" >&5
 if test -d $srcdir/c/src/lib/libmisc; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3402,7 +3412,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6
-echo "configure:3406: checking for Makefile.in in c/src/tests/samples" >&5
+echo "configure:3416: checking for Makefile.in in c/src/tests/samples" >&5
 if test -d $srcdir/c/src/tests/samples; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
diff --git a/configure.in b/configure.in
index f903cd7b94..a4a9125b38 100644
--- a/configure.in
+++ b/configure.in
@@ -318,8 +318,18 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then
     # Is there code where there should be for this BSP?
     # The bare bsp is a special case as it is not under the target_cpu path
     case $i in
-      bare)    bspcpudir= ;;
-      *)       bspcpudir=$target_cpu/ ;;
+      bare)
+        bspcpudir=
+        if test "X${BARE_CPU_CFLAGS}" = "X" ; then
+          AC_MSG_ERROR([--enable-bare-cpu-flags not specified for bare bsp])
+        fi
+        if test "X${BARE_CPU_MODEL}" = "X" ; then
+          AC_MSG_ERROR([--enable-bare-cpu-model not specified for bare bsp])
+        fi
+        ;;
+      *)
+        bspcpudir=$target_cpu/
+        ;;
     esac
      
     if test -d "$srcdir/c/src/lib/libbsp/$bspcpudir$bspdir"; then