Changeset e1664027 in rtems

Timestamp:

04/09/18 06:36:12 (5 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

5, master

Children:

18f77699

Parents:

9f6f026

git-author:

Chris Johns <chrisj@…> (04/09/18 06:36:12)

git-committer:

Chris Johns <chrisj@…> (04/09/18 22:22:07)

Message:

Require the user to provide a BSP list when build SMP or MP.

Close 3383.

Files:

• aclocal/enable-multiprocessing.m4 (modified) (1 diff)
• aclocal/enable-rtemsbsp.m4 (modified) (1 diff)
• aclocal/enable-smp.m4 (modified) (2 diffs)
• configure.ac (modified) (2 diffs)

aclocal/enable-multiprocessing.m4

@@ -6 +6 @@
 communication interface between different RTEMS instances and allows
 synchronization of objects via message passing])],
-[case "${enable_multiprocessing}" in 
-  yes) ;;
+[case "${enable_multiprocessing}" in
+  yes) test -z $enable_rtemsbsp && AC_MSG_ERROR([Multiprocessing requires BSPs to be provided, none have, see --enable-rtemsbsp])
+       ;;
   no) ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-multiprocessing option) ;;

aclocal/enable-rtemsbsp.m4

@@ -7 +7 @@
 AC_ARG_ENABLE(rtemsbsp,
 [AS_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 .."],
-[BSPs to include in build])],
+[BSPs to include in build, required for SMP and MP builds])],
 [case "${enable_rtemsbsp}" in
   yes ) enable_rtemsbsp="" ;;

aclocal/enable-smp.m4

@@ -6 +6 @@
 [AS_HELP_STRING([--enable-smp],[enable support for symmetric multiprocessing
 (SMP)])],
-[case "${enableval}" in 
-  yes) case "${RTEMS_CPU}" in
+[case "${enableval}" in
+  yes) test -z $enable_rtemsbsp && AC_MSG_ERROR([SMP requires BSPs to be provided, none have, see --enable-rtemsbsp])
+       case "${RTEMS_CPU}" in
          arm|powerpc|sparc|i386) RTEMS_HAS_SMP=yes ;;
          *)          RTEMS_HAS_SMP=no ;;
@@ -14 +15 @@
   no) RTEMS_HAS_SMP=no ;;
   *)  AC_MSG_ERROR(bad value ${enableval} for enable-smp option) ;;
-esac],[RTEMS_HAS_SMP=no]) 
+esac],[RTEMS_HAS_SMP=no])
 ])

configure.ac

@@ -22 +22 @@
 ## These option are only in here to let --help report all supported
 ## options.
+RTEMS_ENABLE_RTEMSBSP
 RTEMS_ENABLE_MULTIPROCESSING
+RTEMS_ENABLE_SMP
 RTEMS_ENABLE_POSIX
 RTEMS_ENABLE_NETWORKING
@@ -28 +30 @@
 RTEMS_ENABLE_TESTS
 RTEMS_ENABLE_RTEMS_DEBUG
-RTEMS_ENABLE_RTEMSBSP
 RTEMS_ENABLE_PARAVIRT
 RTEMS_ENABLE_DRVMGR