mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-13 00:21:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

acinclude.m4 (GLIBCXX_DEFAULT_ABI): Change valid arguments for --with-default-libstdcxx-abi

Browse Source 
* acinclude.m4 (GLIBCXX_DEFAULT_ABI): Change valid arguments for
	--with-default-libstdcxx-abi
	* configure: Regenerate.
	* doc/xml/manual/configure.xml: Document valid arguments.

From-SVN: r225356
This commit is contained in:
Jonathan Wakely 2015-07-02 22:52:38 +01:00 committed by Jonathan Wakely
parent 4668d6f9c0
commit 10d712eb7d
4 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2015-07-02 Jonathan Wakely <jwakely@redhat.com>
* acinclude.m4 (GLIBCXX_DEFAULT_ABI): Change valid arguments for
--with-default-libstdcxx-abi
* configure: Regenerate.
* doc/xml/manual/configure.xml: Document valid arguments.
2015-07-02 Uros Bizjak <ubizjak@gmail.com>
* libsupc++/guard.cc (__test_and_acquire): Use __p after __atomic_load

18
libstdc++-v3/acinclude.m4
View File

@ -3792,7 +3792,7 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI], [
fi
if test x"$enable_libstdcxx_dual_abi" != xyes; then
AC_MSG_NOTICE([dual ABI is disabled])
default_libstdcxx_abi="c++98"
default_libstdcxx_abi="gcc4-compatible"
fi
GLIBCXX_CONDITIONAL(ENABLE_DUAL_ABI, test $enable_libstdcxx_dual_abi = yes)
])
@ -3800,7 +3800,7 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_DUAL_ABI], [
dnl
dnl Check to see which ABI should be enabled by default.
dnl
dnl --with-default-libstdcxx-abi={c++98,c++11}
dnl --with-default-libstdcxx-abi={gcc4-compatible,new}
dnl
dnl Defines:
dnl _GLIBCXX_USE_CXX11_ABI (always defined, either to 1 or 0)
@ -3812,14 +3812,16 @@ AC_DEFUN([GLIBCXX_DEFAULT_ABI], [
AS_HELP_STRING([--with-default-libstdcxx-abi],
[set the std::string ABI to use by default]),
[case "$withval" in
c++98|gnu++98|c++03|gnu++03) default_libstdcxx_abi="c++98" ;;
c++1?|gnu++1?) default_libstdcxx_abi="c++11" ;;
*) AC_MSG_ERROR([Invalid argument for --with-default-libstdcxx-abi]) ;;
esac],
[default_libstdcxx_abi="c++11"])
gcc4-compatible) default_libstdcxx_abi="gcc4-compatible" ;;
new|cxx11) default_libstdcxx_abi="new" ;;
c++*|gnu++*) AC_MSG_ERROR([Supported arguments for --with-default-libstdcxx-abi have changed, use "new" or "gcc4-compatible"]) ;;
*) AC_MSG_ERROR([Invalid argument for --with-default-libstdcxx-abi]) ;;
esac
],
[default_libstdcxx_abi="new"])
AC_MSG_RESULT(${default_libstdcxx_abi})
fi
if test $default_libstdcxx_abi = "c++11"; then
if test $default_libstdcxx_abi = "new"; then
glibcxx_cxx11_abi=1
glibcxx_cxx98_abi=0
else

14
libstdc++-v3/configure vendored
View File

@ -78180,7 +78180,7 @@ fi
if test x"$enable_libstdcxx_dual_abi" != xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: dual ABI is disabled" >&5
$as_echo "$as_me: dual ABI is disabled" >&6;}
default_libstdcxx_abi="c++98"
default_libstdcxx_abi="gcc4-compatible"
fi
@ -78192,18 +78192,20 @@ $as_echo_n "checking for default std::string ABI to use... " >&6; }
# Check whether --with-default-libstdcxx-abi was given.
if test "${with_default_libstdcxx_abi+set}" = set; then :
withval=$with_default_libstdcxx_abi; case "$withval" in
c++98|gnu++98|c++03|gnu++03) default_libstdcxx_abi="c++98" ;;
c++1?|gnu++1?) default_libstdcxx_abi="c++11" ;;
*) as_fn_error "Invalid argument for --with-default-libstdcxx-abi" "$LINENO" 5 ;;
gcc4-compatible) default_libstdcxx_abi="gcc4-compatible" ;;
new|cxx11) default_libstdcxx_abi="new" ;;
c++*|gnu++*) as_fn_error "Supported arguments for --with-default-libstdcxx-abi have changed, use \"new\" or \"gcc4-compatible\"" "$LINENO" 5 ;;
*) as_fn_error "Invalid argument for --with-default-libstdcxx-abi" "$LINENO" 5 ;;
esac
else
default_libstdcxx_abi="c++11"
default_libstdcxx_abi="new"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${default_libstdcxx_abi}" >&5
$as_echo "${default_libstdcxx_abi}" >&6; }
fi
if test $default_libstdcxx_abi = "c++11"; then
if test $default_libstdcxx_abi = "new"; then
glibcxx_cxx11_abi=1
glibcxx_cxx98_abi=0
else

5
libstdc++-v3/doc/xml/manual/configure.xml
View File

@ -389,9 +389,10 @@
<para>
Set the default value for the <symbol>_GLIBCXX_USE_CXX11_ABI</symbol>
macro (see <xref linkend="manual.intro.using.macros"/>).
The default is <option>OPTION=c++11</option> which sets the macro to
The default is <option>OPTION=new</option> which sets the macro to
<literal>1</literal>,
use <option>OPTION=c++98</option> to set it to <literal>0</literal>.
use <option>OPTION=gcc4-compatible</option> to set it to
<literal>0</literal>.
This option does not change the library ABI.
</para>
</listitem></varlistentry>