From 6821a629c3bff45770b376702a6e31b4dc656df7 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 8 Sep 2014 10:19:42 +0200
Subject: 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 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'c/src/aclocal')

diff --git a/c/src/aclocal/prog-cxx.m4 b/c/src/aclocal/prog-cxx.m4
index ba596ba05d..957a595da2 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" \
-- 
cgit v1.2.3