[rtems commit] Add -std=gnu++11 to CXXFLAGS if SMP is enabled

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    6821a629c3bff45770b376702a6e31b4dc656df7
Changeset: http://git.rtems.org/rtems/commit/?id=6821a629c3bff45770b376702a6e31b4dc656df7

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Sep  8 10:19:42 2014 +0200

Add -std=gnu++11 to CXXFLAGS if SMP is enabled

This is necessary to use the <atomic> header file used for the atomic
operations.

---

 c/src/aclocal/prog-cxx.m4      |   11 +++++++++--
 testsuites/aclocal/prog-cxx.m4 |    7 ++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/c/src/aclocal/prog-cxx.m4 b/c/src/aclocal/prog-cxx.m4
index ba596ba..957a595 100644
--- a/c/src/aclocal/prog-cxx.m4
+++ b/c/src/aclocal/prog-cxx.m4
@@ -6,11 +6,18 @@ AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
 [
 AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
 AC_REQUIRE([RTEMS_ENABLE_CXX])
+AC_REQUIRE([RTEMS_CHECK_SMP])
+
+# If CXXFLAGS is not set, default to CFLAGS
+if test x"$rtems_cv_HAS_SMP" = x"yes" ; then
+  CXXFLAGS=${CXXFLAGS-${CFLAGS} -std=gnu++11}
+else
+  CXXFLAGS=${CXXFLAGS-${CFLAGS}}
+fi
+
 RTEMS_CHECK_TOOL(CXX,g++)
 if test "$RTEMS_HAS_CPLUSPLUS" = "yes";
 then
-  CXXFLAGS=${CXXFLAGS-${CFLAGS}}
-
 dnl Only accept g++
 dnl NOTE: This might be too restrictive
 test -z "$CXX" \
diff --git a/testsuites/aclocal/prog-cxx.m4 b/testsuites/aclocal/prog-cxx.m4
index fdbb129..c71bac9 100644
--- a/testsuites/aclocal/prog-cxx.m4
+++ b/testsuites/aclocal/prog-cxx.m4
@@ -6,9 +6,14 @@ AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
 [
 AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
 AC_REQUIRE([RTEMS_ENABLE_CXX])
+RTEMS_CHECK_CPUOPTS([RTEMS_SMP])
 
 # If CXXFLAGS is not set, default to CFLAGS
-CXXFLAGS=${CXXFLAGS-${CFLAGS}}
+if test x"$rtems_cv_RTEMS_SMP" = x"yes" ; then
+  CXXFLAGS=${CXXFLAGS-${CFLAGS} -std=gnu++11}
+else
+  CXXFLAGS=${CXXFLAGS-${CFLAGS}}
+fi
 
 RTEMS_CHECK_TOOL(CXX,g++)
 if test "$RTEMS_HAS_CPLUSPLUS" = "yes";