FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

acinclude.m4 (GLIBCXX_ENABLE): Properly quote argument to AC_HELP_STRING.

Browse source 
* acinclude.m4 (GLIBCXX_ENABLE): Properly quote argument to
AC_HELP_STRING.  Double quote expansion of _g_help.
(GLIBCXX_ENABLE_LIBSTDCXX_TIME): Double quote third argument of
GLIBCXX_ENABLE.
(GLIBCXX_ENABLE_CHEADERS): Likewise.
(GLIBCXX_ENABLE_CLOCALE): Likewise.
(GLIBCXX_ENABLE_ALLOCATOR): Likewise.
(GLIBCXX_ENABLE_CSTDIO): Likewise.
(GLIBCXX_ENABLE_SYMVERS): Likewise.
* configure: Regenerate.

From-SVN: r164927
This commit is contained in:
Andreas Schwab 2010-10-04 08:49:59 +00:00 • committed by Andreas Schwab
parent 478a1c5b90
commit b453ace381
3 changed files with 37 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,16 @@
2010-10-04 Andreas Schwab <schwab@redhat.com>
* acinclude.m4 (GLIBCXX_ENABLE): Properly quote argument to
AC_HELP_STRING. Double quote expansion of _g_help.
(GLIBCXX_ENABLE_LIBSTDCXX_TIME): Double quote third argument of
GLIBCXX_ENABLE.
(GLIBCXX_ENABLE_CHEADERS): Likewise.
(GLIBCXX_ENABLE_CLOCALE): Likewise.
(GLIBCXX_ENABLE_ALLOCATOR): Likewise.
(GLIBCXX_ENABLE_CSTDIO): Likewise.
(GLIBCXX_ENABLE_SYMVERS): Likewise.
* configure: Regenerate.
2010-10-02 H.J. Lu <hongjiu.lu@intel.com>
PR libstdc++/45863

16
libstdc++-v3/acinclude.m4
View file

@ -776,8 +776,8 @@ dnl See docs/html/17_intro/configury.html#enable for documentation.
dnl
m4_define([GLIBCXX_ENABLE],[dnl
m4_define([_g_switch],[--enable-$1])dnl
m4_define([_g_help],[AC_HELP_STRING(_g_switch$3,[$4 @<:@default=$2@:>@])])dnl
AC_ARG_ENABLE($1,_g_help,
m4_define([_g_help],[AC_HELP_STRING([_g_switch$3],[$4 @<:@default=$2@:>@])])dnl
AC_ARG_ENABLE([$1],m4_dquote(_g_help),
m4_bmatch([$5],
[^permit ],
[[
@ -1072,7 +1072,7 @@ dnl
AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
AC_MSG_CHECKING([for clock_gettime, nanosleep and sched_yield])
GLIBCXX_ENABLE(libstdcxx-time,$1,[=KIND],
GLIBCXX_ENABLE(libstdcxx-time,$1,[[[=KIND]]],
[use KIND for check type],
[permit yes|no|rt])
@ -1684,7 +1684,7 @@ dnl + Usage: GLIBCXX_ENABLE_CHEADERS[(DEFAULT)]
dnl Where DEFAULT is either 'c' or 'c_std' or 'c_global'.
dnl
AC_DEFUN([GLIBCXX_ENABLE_CHEADERS], [
GLIBCXX_ENABLE(cheaders,$1,[=KIND],
GLIBCXX_ENABLE(cheaders,$1,[[[=KIND]]],
[construct "C" headers for g++], [permit c|c_std|c_global])
AC_MSG_NOTICE("C" header strategy set to $enable_cheaders)
@ -1710,7 +1710,7 @@ dnl
dnl Default is generic.
dnl
AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
GLIBCXX_ENABLE(clocale,auto,[[[=MODEL]]],
[use MODEL for target locale package],
[permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
@ -1915,7 +1915,7 @@ dnl Default is new.
dnl
AC_DEFUN([GLIBCXX_ENABLE_ALLOCATOR], [
AC_MSG_CHECKING([for std::allocator base class])
GLIBCXX_ENABLE(libstdcxx-allocator,auto,[=KIND],
GLIBCXX_ENABLE(libstdcxx-allocator,auto,[[[=KIND]]],
[use KIND for target std::allocator base],
[permit new|malloc|mt|bitmap|pool|yes|no|auto])
@ -2022,7 +2022,7 @@ dnl Default is stdio.
dnl
AC_DEFUN([GLIBCXX_ENABLE_CSTDIO], [
AC_MSG_CHECKING([for underlying I/O to use])
GLIBCXX_ENABLE(cstdio,stdio,[=PACKAGE],
GLIBCXX_ENABLE(cstdio,stdio,[[[=PACKAGE]]],
[use target-specific I/O package], [permit stdio])
# Now that libio has been removed, you can have any color you want as long
@ -2812,7 +2812,7 @@ dnl 'no' disables versioning.
dnl
AC_DEFUN([GLIBCXX_ENABLE_SYMVERS], [
GLIBCXX_ENABLE(symvers,$1,[=STYLE],
GLIBCXX_ENABLE(symvers,$1,[[[=STYLE]]],
[enables symbol versioning of the shared library],
[permit yes|no|gnu|gnu-versioned-namespace|darwin|darwin-export|sun])

29
libstdc++-v3/configure vendored
View file

@ -1492,14 +1492,16 @@ Optional Features:
[default=auto]
--enable-libstdcxx-pch build pre-compiled libstdc++ headers
[default=$is_hosted]
--enable-cstdio=PACKAGE use target-specific I/O package [default=stdio]
--enable-cstdio[=PACKAGE]
use target-specific I/O package [default=stdio]
--enable-clocale[=MODEL]
use MODEL for target locale package [default=auto]
--enable-nls use Native Language Support (default)
--enable-libstdcxx-allocator=KIND
--enable-libstdcxx-allocator[=KIND]
use KIND for target std::allocator base
[default=auto]
--enable-cheaders=KIND construct "C" headers for g++ [default=$c_model]
--enable-cheaders[=KIND]
construct "C" headers for g++ [default=$c_model]
--enable-long-long enable template specializations for 'long long'
[default=yes]
--enable-wchar_t enable template specializations for 'wchar_t'
@ -1516,12 +1518,13 @@ Optional Features:
--enable-fully-dynamic-string
do not put empty strings in per-process static
memory [default=no]
--enable-libstdcxx-time=KIND
--enable-libstdcxx-time[=KIND]
use KIND for check type [default=no]
--enable-tls Use thread-local storage [default=yes]
--disable-rpath do not hardcode runtime library paths
--enable-linux-futex use the Linux futex system call [default=default]
--enable-symvers=STYLE enables symbol versioning of the shared library
--enable-symvers[=STYLE]
enables symbol versioning of the shared library
[default=yes]
--enable-visibility enables visibility safe usage [default=yes]
--enable-version-specific-runtime-libs
@ -11466,7 +11469,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11469 "configure"
#line 11472 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11572,7 +11575,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 11575 "configure"
#line 11578 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -14912,7 +14915,7 @@ fi
#
# Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
cat > conftest.$ac_ext << EOF
#line 14915 "configure"
#line 14918 "configure"
struct S { ~S(); };
void bar();
void foo()
@ -15280,7 +15283,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
# Fake what AC_TRY_COMPILE does.
cat > conftest.$ac_ext << EOF
#line 15283 "configure"
#line 15286 "configure"
int main()
{
typedef bool atomic_type;
@ -15317,7 +15320,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; }
rm -f conftest*
cat > conftest.$ac_ext << EOF
#line 15320 "configure"
#line 15323 "configure"
int main()
{
typedef short atomic_type;
@ -15354,7 +15357,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; }
rm -f conftest*
cat > conftest.$ac_ext << EOF
#line 15357 "configure"
#line 15360 "configure"
int main()
{
// NB: _Atomic_word not necessarily int.
@ -15392,7 +15395,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }
rm -f conftest*
cat > conftest.$ac_ext << EOF
#line 15395 "configure"
#line 15398 "configure"
int main()
{
typedef long long atomic_type;
@ -15468,7 +15471,7 @@ $as_echo "$as_me: WARNING: Performance of certain classes will degrade as a resu
# unnecessary for this test.
cat > conftest.$ac_ext << EOF
#line 15471 "configure"
#line 15474 "configure"
int main()
{
_Decimal32 d1;