RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
This is necessary to use the <atomic> header file used for the atomic
operations.
This commit is contained in:
Sebastian Huber
2014-09-08 10:19:42 +02:00
parent d11e6efec5
commit 6821a629c3
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
c/src/aclocal/prog-cxx.m4
View File

@@ -6,11 +6,18 @@ AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
[ [
AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
AC_REQUIRE([RTEMS_ENABLE_CXX]) 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++) RTEMS_CHECK_TOOL(CXX,g++)
if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; if test "$RTEMS_HAS_CPLUSPLUS" = "yes";
then then
CXXFLAGS=${CXXFLAGS-${CFLAGS}}
dnl Only accept g++ dnl Only accept g++
dnl NOTE: This might be too restrictive dnl NOTE: This might be too restrictive
test -z "$CXX" \ test -z "$CXX" \

7
testsuites/aclocal/prog-cxx.m4
View File

@@ -6,9 +6,14 @@ AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
[ [
AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
AC_REQUIRE([RTEMS_ENABLE_CXX]) AC_REQUIRE([RTEMS_ENABLE_CXX])
RTEMS_CHECK_CPUOPTS([RTEMS_SMP])
# If CXXFLAGS is not set, default to CFLAGS # 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++) RTEMS_CHECK_TOOL(CXX,g++)
if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; if test "$RTEMS_HAS_CPLUSPLUS" = "yes";