diff options
| author | Chris Johns <chrisj@rtems.org> | 2018-04-09 16:36:12 +1000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2018-04-10 08:22:07 +1000 |
| commit | e1664027fe334db174ed74372138d3236f89b52c (patch) | |
| tree | 3f21e5787f8445532c23c3278f7017386879a61d | |
| parent | Generate an error if no valid gcc is found when configure runs. (diff) | |
| download | rtems-e1664027fe334db174ed74372138d3236f89b52c.tar.bz2 | |
Require the user to provide a BSP list when build SMP or MP.
Close 3383.
| -rw-r--r-- | aclocal/enable-multiprocessing.m4 | 5 | ||||
| -rw-r--r-- | aclocal/enable-rtemsbsp.m4 | 2 | ||||
| -rw-r--r-- | aclocal/enable-smp.m4 | 7 | ||||
| -rw-r--r-- | configure.ac | 3 |
4 files changed, 10 insertions, 7 deletions
diff --git a/aclocal/enable-multiprocessing.m4 b/aclocal/enable-multiprocessing.m4 index 53fa8ffe81..6f8843d1f6 100644 --- a/aclocal/enable-multiprocessing.m4 +++ b/aclocal/enable-multiprocessing.m4 @@ -5,8 +5,9 @@ AC_ARG_ENABLE(multiprocessing, [enable multiprocessing interface; the multiprocessing interface is a 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) ;; esac],[enable_multiprocessing=no]) diff --git a/aclocal/enable-rtemsbsp.m4 b/aclocal/enable-rtemsbsp.m4 index 613a29e290..718275e1df 100644 --- a/aclocal/enable-rtemsbsp.m4 +++ b/aclocal/enable-rtemsbsp.m4 @@ -6,7 +6,7 @@ AC_DEFUN([RTEMS_ENABLE_RTEMSBSP], AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP]) 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="" ;; no ) enable_rtemsbsp="no" ;; diff --git a/aclocal/enable-smp.m4 b/aclocal/enable-smp.m4 index 590a7b15ff..e6461de685 100644 --- a/aclocal/enable-smp.m4 +++ b/aclocal/enable-smp.m4 @@ -5,13 +5,14 @@ AC_DEFUN([RTEMS_ENABLE_SMP], AC_ARG_ENABLE(smp, [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 ;; esac ;; 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]) ]) diff --git a/configure.ac b/configure.ac index d1fb7f23da..5933bb88f4 100644 --- a/configure.ac +++ b/configure.ac @@ -21,13 +21,14 @@ AM_MAINTAINER_MODE ## 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 RTEMS_ENABLE_CXX RTEMS_ENABLE_TESTS RTEMS_ENABLE_RTEMS_DEBUG -RTEMS_ENABLE_RTEMSBSP RTEMS_ENABLE_PARAVIRT RTEMS_ENABLE_DRVMGR |