Changeset 6821a629 in rtems

Timestamp:

09/08/14 08:19:42 (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

80ad7090

Parents:

d11e6efe

git-author:

Sebastian Huber <sebastian.huber@…> (09/08/14 08:19:42)

git-committer:

Sebastian Huber <sebastian.huber@…> (09/08/14 09:13:53)

Message:

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

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

Files:

• c/src/aclocal/prog-cxx.m4 (modified) (1 diff)
• testsuites/aclocal/prog-cxx.m4 (modified) (1 diff)

c/src/aclocal/prog-cxx.m4

@@ -7 +7 @@
 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

testsuites/aclocal/prog-cxx.m4

@@ -7 +7 @@
 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++)