mirror of git://gcc.gnu.org/git/gcc.git
acinclude.m4 (GLIBCPP_CHECK_*_DECL_AND_LINKAGE_*): Pre-test whether the cached result is present.
2000-12-06 Phil Edwards <pme@sources.redhat.com> * acinclude.m4 (GLIBCPP_CHECK_*_DECL_AND_LINKAGE_*): Pre-test whether the cached result is present. * aclocal.m4: Regenerate. * configure: Regenerate. * Makefile.in: Regenerate. * libio/Makefile.in: Regenerate. * libmath/Makefile.in: Regenerate. * libsupc++/Makefile.in: Regenerate. * src/Makefile.in: Regenerate. From-SVN: r38079
This commit is contained in:
parent
308d7d2b3b
commit
f84ef7fb01
|
@ -1,3 +1,15 @@
|
||||||
|
2000-12-06 Phil Edwards <pme@sources.redhat.com>
|
||||||
|
|
||||||
|
* acinclude.m4 (GLIBCPP_CHECK_*_DECL_AND_LINKAGE_*): Pre-test
|
||||||
|
whether the cached result is present.
|
||||||
|
* aclocal.m4: Regenerate.
|
||||||
|
* configure: Regenerate.
|
||||||
|
* Makefile.in: Regenerate.
|
||||||
|
* libio/Makefile.in: Regenerate.
|
||||||
|
* libmath/Makefile.in: Regenerate.
|
||||||
|
* libsupc++/Makefile.in: Regenerate.
|
||||||
|
* src/Makefile.in: Regenerate.
|
||||||
|
|
||||||
2000-12-06 Richard Earnshaw <rearnsha@arm.com>
|
2000-12-06 Richard Earnshaw <rearnsha@arm.com>
|
||||||
|
|
||||||
* configure.target (*-*-freebsd, *-*-netbsd): Correct paths to
|
* configure.target (*-*-freebsd, *-*-netbsd): Correct paths to
|
||||||
|
|
|
@ -135,7 +135,48 @@ MULTICLEAN = true
|
||||||
# Work around what appears to be a GNU make bug handling MAKEFLAGS
|
# Work around what appears to be a GNU make bug handling MAKEFLAGS
|
||||||
# values defined in terms of make variables, as is the case for CC and
|
# values defined in terms of make variables, as is the case for CC and
|
||||||
# friends when we are called from the top level Makefile.
|
# friends when we are called from the top level Makefile.
|
||||||
AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CC_FOR_TARGET=$(CC_FOR_TARGET)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "EXPECT=$(EXPECT)" "RUNTEST=$(RUNTEST)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "includedir=$(includedir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC)" "CXX=$(CXX)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "NM=$(NM)" "NM_FOR_BUILD=$(NM_FOR_BUILD)" "NM_FOR_TARGET=$(NM_FOR_TARGET)" "DESTDIR=$(DESTDIR)" "WERROR=$(WERROR)"
|
AM_MAKEFLAGS = \
|
||||||
|
"AR_FLAGS=$(AR_FLAGS)" \
|
||||||
|
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
|
||||||
|
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
|
||||||
|
"CFLAGS=$(CFLAGS)" \
|
||||||
|
"CXXFLAGS=$(CXXFLAGS)" \
|
||||||
|
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
|
||||||
|
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
|
||||||
|
"INSTALL=$(INSTALL)" \
|
||||||
|
"INSTALL_DATA=$(INSTALL_DATA)" \
|
||||||
|
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
||||||
|
"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
|
||||||
|
"LDFLAGS=$(LDFLAGS)" \
|
||||||
|
"LIBCFLAGS=$(LIBCFLAGS)" \
|
||||||
|
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
|
||||||
|
"MAKE=$(MAKE)" \
|
||||||
|
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
|
||||||
|
"PICFLAG=$(PICFLAG)" \
|
||||||
|
"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
|
||||||
|
"SHELL=$(SHELL)" \
|
||||||
|
"EXPECT=$(EXPECT)" \
|
||||||
|
"RUNTEST=$(RUNTEST)" \
|
||||||
|
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
||||||
|
"exec_prefix=$(exec_prefix)" \
|
||||||
|
"infodir=$(infodir)" \
|
||||||
|
"libdir=$(libdir)" \
|
||||||
|
"includedir=$(includedir)" \
|
||||||
|
"prefix=$(prefix)" \
|
||||||
|
"tooldir=$(tooldir)" \
|
||||||
|
"AR=$(AR)" \
|
||||||
|
"AS=$(AS)" \
|
||||||
|
"CC=$(CC)" \
|
||||||
|
"CXX=$(CXX)" \
|
||||||
|
"LD=$(LD)" \
|
||||||
|
"LIBCFLAGS=$(LIBCFLAGS)" \
|
||||||
|
"PICFLAG=$(PICFLAG)" \
|
||||||
|
"RANLIB=$(RANLIB)" \
|
||||||
|
"NM=$(NM)" \
|
||||||
|
"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
|
||||||
|
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
|
||||||
|
"DESTDIR=$(DESTDIR)" \
|
||||||
|
"WERROR=$(WERROR)"
|
||||||
|
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
||||||
|
|
|
@ -337,14 +337,16 @@ dnl
|
||||||
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1
|
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1
|
||||||
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
|
||||||
AC_MSG_CHECKING([for $1 declaration])
|
AC_MSG_CHECKING([for $1 declaration])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
||||||
AC_LANG_SAVE
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_SAVE
|
||||||
AC_TRY_COMPILE([#include <math.h>],
|
AC_LANG_CPLUSPLUS
|
||||||
[ $1(0);],
|
AC_TRY_COMPILE([#include <math.h>],
|
||||||
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
[ $1(0);],
|
||||||
AC_LANG_RESTORE
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
||||||
])
|
AC_LANG_RESTORE
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
||||||
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
||||||
AC_CHECK_FUNCS($1)
|
AC_CHECK_FUNCS($1)
|
||||||
|
@ -366,14 +368,16 @@ dnl
|
||||||
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2
|
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2
|
||||||
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [
|
||||||
AC_MSG_CHECKING([for $1 declaration])
|
AC_MSG_CHECKING([for $1 declaration])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
||||||
AC_LANG_SAVE
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_SAVE
|
||||||
AC_TRY_COMPILE([#include <math.h>],
|
AC_LANG_CPLUSPLUS
|
||||||
[ $1(0, 0);],
|
AC_TRY_COMPILE([#include <math.h>],
|
||||||
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
[ $1(0, 0);],
|
||||||
AC_LANG_RESTORE
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
||||||
])
|
AC_LANG_RESTORE
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
||||||
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
||||||
AC_CHECK_FUNCS($1)
|
AC_CHECK_FUNCS($1)
|
||||||
|
@ -395,14 +399,16 @@ dnl
|
||||||
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3
|
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3
|
||||||
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [
|
||||||
AC_MSG_CHECKING([for $1 declaration])
|
AC_MSG_CHECKING([for $1 declaration])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
||||||
AC_LANG_SAVE
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_SAVE
|
||||||
AC_TRY_COMPILE([#include <math.h>],
|
AC_LANG_CPLUSPLUS
|
||||||
[ $1(0, 0, 0);],
|
AC_TRY_COMPILE([#include <math.h>],
|
||||||
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
[ $1(0, 0, 0);],
|
||||||
AC_LANG_RESTORE
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
||||||
])
|
AC_LANG_RESTORE
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
||||||
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
||||||
AC_CHECK_FUNCS($1)
|
AC_CHECK_FUNCS($1)
|
||||||
|
@ -425,14 +431,16 @@ dnl
|
||||||
dnl GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2
|
dnl GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2
|
||||||
AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [
|
AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [
|
||||||
AC_MSG_CHECKING([for $1 declaration])
|
AC_MSG_CHECKING([for $1 declaration])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
||||||
AC_LANG_SAVE
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_SAVE
|
||||||
AC_TRY_COMPILE([#include <stdlib.h>],
|
AC_LANG_CPLUSPLUS
|
||||||
[ $1(0, 0);],
|
AC_TRY_COMPILE([#include <stdlib.h>],
|
||||||
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
[ $1(0, 0);],
|
||||||
AC_LANG_RESTORE
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
||||||
])
|
AC_LANG_RESTORE
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
||||||
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
||||||
AC_CHECK_FUNCS($1)
|
AC_CHECK_FUNCS($1)
|
||||||
|
@ -456,22 +464,26 @@ dnl
|
||||||
dnl GLIBCPP_CHECK_BUILTIN_MATH_DECL_LINKAGE_1
|
dnl GLIBCPP_CHECK_BUILTIN_MATH_DECL_LINKAGE_1
|
||||||
AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
|
AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
|
||||||
AC_MSG_CHECKING([for $1 declaration])
|
AC_MSG_CHECKING([for $1 declaration])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
||||||
AC_LANG_SAVE
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_SAVE
|
||||||
AC_TRY_COMPILE([#include <math.h>],
|
AC_LANG_CPLUSPLUS
|
||||||
[ $1(0);],
|
AC_TRY_COMPILE([#include <math.h>],
|
||||||
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
[ $1(0);],
|
||||||
AC_LANG_RESTORE
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
||||||
])
|
AC_LANG_RESTORE
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
||||||
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
||||||
AC_MSG_CHECKING([for $1 linkage])
|
AC_MSG_CHECKING([for $1 linkage])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_link, [
|
if test x${glibcpp_cv_func_$1_link+set} != xset; then
|
||||||
AC_TRY_LINK([#include <math.h>],
|
AC_CACHE_VAL(glibcpp_cv_func_$1_link, [
|
||||||
[ $1(0);],
|
AC_TRY_LINK([#include <math.h>],
|
||||||
[glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no])
|
[ $1(0);],
|
||||||
])
|
[glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no])
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_link)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_link)
|
||||||
if test x$glibcpp_cv_func_$1_link = x"yes"; then
|
if test x$glibcpp_cv_func_$1_link = x"yes"; then
|
||||||
ac_tr_func=HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
ac_tr_func=HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
||||||
|
|
|
@ -349,14 +349,16 @@ dnl
|
||||||
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1
|
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1
|
||||||
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
|
||||||
AC_MSG_CHECKING([for $1 declaration])
|
AC_MSG_CHECKING([for $1 declaration])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
||||||
AC_LANG_SAVE
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_SAVE
|
||||||
AC_TRY_COMPILE([#include <math.h>],
|
AC_LANG_CPLUSPLUS
|
||||||
[ $1(0);],
|
AC_TRY_COMPILE([#include <math.h>],
|
||||||
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
[ $1(0);],
|
||||||
AC_LANG_RESTORE
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
||||||
])
|
AC_LANG_RESTORE
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
||||||
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
||||||
AC_CHECK_FUNCS($1)
|
AC_CHECK_FUNCS($1)
|
||||||
|
@ -378,14 +380,16 @@ dnl
|
||||||
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2
|
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2
|
||||||
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [
|
||||||
AC_MSG_CHECKING([for $1 declaration])
|
AC_MSG_CHECKING([for $1 declaration])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
||||||
AC_LANG_SAVE
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_SAVE
|
||||||
AC_TRY_COMPILE([#include <math.h>],
|
AC_LANG_CPLUSPLUS
|
||||||
[ $1(0, 0);],
|
AC_TRY_COMPILE([#include <math.h>],
|
||||||
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
[ $1(0, 0);],
|
||||||
AC_LANG_RESTORE
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
||||||
])
|
AC_LANG_RESTORE
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
||||||
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
||||||
AC_CHECK_FUNCS($1)
|
AC_CHECK_FUNCS($1)
|
||||||
|
@ -407,14 +411,16 @@ dnl
|
||||||
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3
|
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3
|
||||||
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [
|
||||||
AC_MSG_CHECKING([for $1 declaration])
|
AC_MSG_CHECKING([for $1 declaration])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
||||||
AC_LANG_SAVE
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_SAVE
|
||||||
AC_TRY_COMPILE([#include <math.h>],
|
AC_LANG_CPLUSPLUS
|
||||||
[ $1(0, 0, 0);],
|
AC_TRY_COMPILE([#include <math.h>],
|
||||||
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
[ $1(0, 0, 0);],
|
||||||
AC_LANG_RESTORE
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
||||||
])
|
AC_LANG_RESTORE
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
||||||
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
||||||
AC_CHECK_FUNCS($1)
|
AC_CHECK_FUNCS($1)
|
||||||
|
@ -437,14 +443,16 @@ dnl
|
||||||
dnl GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2
|
dnl GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2
|
||||||
AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [
|
AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [
|
||||||
AC_MSG_CHECKING([for $1 declaration])
|
AC_MSG_CHECKING([for $1 declaration])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
||||||
AC_LANG_SAVE
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_SAVE
|
||||||
AC_TRY_COMPILE([#include <stdlib.h>],
|
AC_LANG_CPLUSPLUS
|
||||||
[ $1(0, 0);],
|
AC_TRY_COMPILE([#include <stdlib.h>],
|
||||||
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
[ $1(0, 0);],
|
||||||
AC_LANG_RESTORE
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
||||||
])
|
AC_LANG_RESTORE
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
||||||
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
||||||
AC_CHECK_FUNCS($1)
|
AC_CHECK_FUNCS($1)
|
||||||
|
@ -468,22 +476,26 @@ dnl
|
||||||
dnl GLIBCPP_CHECK_BUILTIN_MATH_DECL_LINKAGE_1
|
dnl GLIBCPP_CHECK_BUILTIN_MATH_DECL_LINKAGE_1
|
||||||
AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
|
AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
|
||||||
AC_MSG_CHECKING([for $1 declaration])
|
AC_MSG_CHECKING([for $1 declaration])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
||||||
AC_LANG_SAVE
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_SAVE
|
||||||
AC_TRY_COMPILE([#include <math.h>],
|
AC_LANG_CPLUSPLUS
|
||||||
[ $1(0);],
|
AC_TRY_COMPILE([#include <math.h>],
|
||||||
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
[ $1(0);],
|
||||||
AC_LANG_RESTORE
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
||||||
])
|
AC_LANG_RESTORE
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
||||||
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
||||||
AC_MSG_CHECKING([for $1 linkage])
|
AC_MSG_CHECKING([for $1 linkage])
|
||||||
AC_CACHE_VAL(glibcpp_cv_func_$1_link, [
|
if test x${glibcpp_cv_func_$1_link+set} != xset; then
|
||||||
AC_TRY_LINK([#include <math.h>],
|
AC_CACHE_VAL(glibcpp_cv_func_$1_link, [
|
||||||
[ $1(0);],
|
AC_TRY_LINK([#include <math.h>],
|
||||||
[glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no])
|
[ $1(0);],
|
||||||
])
|
[glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no])
|
||||||
|
])
|
||||||
|
fi
|
||||||
AC_MSG_RESULT($glibcpp_cv_func_$1_link)
|
AC_MSG_RESULT($glibcpp_cv_func_$1_link)
|
||||||
if test x$glibcpp_cv_func_$1_link = x"yes"; then
|
if test x$glibcpp_cv_func_$1_link = x"yes"; then
|
||||||
ac_tr_func=HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
ac_tr_func=HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -122,14 +122,21 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
|
||||||
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
||||||
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
|
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
|
||||||
|
|
||||||
INCLUDES = -nostdinc++ -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
|
INCLUDES = \
|
||||||
|
-nostdinc++ \
|
||||||
|
-I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) \
|
||||||
|
$(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
|
||||||
|
|
||||||
|
|
||||||
libio_headers = libio.h libioP.h iolibio.h
|
libio_headers = \
|
||||||
|
libio.h libioP.h iolibio.h
|
||||||
|
|
||||||
@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c iofclose.c iofopen.c stdio.c
|
@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = @GLIBCPP_NEED_LIBIO_TRUE@\
|
||||||
|
@GLIBCPP_NEED_LIBIO_TRUE@ filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c iofclose.c \
|
||||||
|
@GLIBCPP_NEED_LIBIO_TRUE@ iofopen.c stdio.c
|
||||||
@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS =
|
@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS =
|
||||||
@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = wfiledoalloc.c wfileops.c wgenops.c iofwide.c
|
@GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = @GLIBCPP_NEED_WLIBIO_TRUE@\
|
||||||
|
@GLIBCPP_NEED_WLIBIO_TRUE@ wfiledoalloc.c wfileops.c wgenops.c iofwide.c
|
||||||
@GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS =
|
@GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS =
|
||||||
|
|
||||||
EXTRA_DIST = iostreamP.h
|
EXTRA_DIST = iostreamP.h
|
||||||
|
|
|
@ -113,18 +113,31 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libmath.la
|
noinst_LTLIBRARIES = libmath.la
|
||||||
|
|
||||||
EXTRA_LONG_DOUBLE_yes = ccosl.c cexpl.c clog10l.c csinhl.c csqrtl.c ctanhl.c ctanl.c hypotl.c signbitl.c
|
EXTRA_LONG_DOUBLE_yes = \
|
||||||
|
ccosl.c cexpl.c clog10l.c csinhl.c \
|
||||||
|
csqrtl.c ctanhl.c ctanl.c hypotl.c \
|
||||||
|
signbitl.c
|
||||||
|
|
||||||
|
|
||||||
EXTRA_DIST = ccos.c ccosf.c ccosh.c ccoshf.c ccoshl.c cexp.c cexpf.c clog10.c clog10f.c csin.c csinf.c csinh.c csinhf.c csinl.c csqrt.c csqrtf.c ctan.c ctanf.c ctanh.c ctanhf.c hypot.c hypotf.c atan2f.c expf.c $(EXTRA_LONG_DOUBLE_yes)
|
EXTRA_DIST = \
|
||||||
|
ccos.c ccosf.c ccosh.c ccoshf.c ccoshl.c \
|
||||||
|
cexp.c cexpf.c clog10.c clog10f.c \
|
||||||
|
csin.c csinf.c csinh.c csinhf.c \
|
||||||
|
csinl.c csqrt.c csqrtf.c ctan.c ctanf.c ctanh.c \
|
||||||
|
ctanhf.c hypot.c hypotf.c\
|
||||||
|
atan2f.c expf.c \
|
||||||
|
$(EXTRA_LONG_DOUBLE_yes)
|
||||||
|
|
||||||
|
|
||||||
libmath_la_LIBADD = @LIBMATHOBJS@ $(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE))
|
libmath_la_LIBADD = \
|
||||||
|
@LIBMATHOBJS@ \
|
||||||
|
$(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE))
|
||||||
|
|
||||||
|
|
||||||
libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
|
libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
|
||||||
|
|
||||||
libmath_la_SOURCES = signbit.c signbitf.c
|
libmath_la_SOURCES = \
|
||||||
|
signbit.c signbitf.c
|
||||||
|
|
||||||
|
|
||||||
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||||
|
@ -138,7 +151,9 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
|
||||||
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
||||||
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
|
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
|
||||||
|
|
||||||
INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include $(TOPLEVEL_INCLUDES)
|
INCLUDES = \
|
||||||
|
-I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include \
|
||||||
|
$(TOPLEVEL_INCLUDES)
|
||||||
|
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
||||||
CONFIG_HEADER = ../config.h
|
CONFIG_HEADER = ../config.h
|
||||||
|
|
|
@ -111,12 +111,12 @@ MAINT_CHARSET = latin1
|
||||||
|
|
||||||
# Cross compiler and multilib support.
|
# Cross compiler and multilib support.
|
||||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||||
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @gcc_version@
|
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@@gcc_version@
|
||||||
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = $(libdir)/gcc-lib/$(target_alias)
|
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@$(libdir)/gcc-lib/$(target_alias)
|
||||||
@USE_LIBDIR_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
|
@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
|
||||||
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = $(toolexecdir)/$(gcc_version)
|
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@$(toolexecdir)/$(gcc_version)
|
||||||
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
|
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@$(libdir)$(MULTISUBDIR)
|
||||||
@USE_LIBDIR_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
|
||||||
|
|
||||||
# Need this library to both be part of libstdc++.a, and installed
|
# Need this library to both be part of libstdc++.a, and installed
|
||||||
# separately too.
|
# separately too.
|
||||||
|
@ -132,11 +132,13 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
|
||||||
# These bits are all figured out from configure. Look in acinclude.m4
|
# These bits are all figured out from configure. Look in acinclude.m4
|
||||||
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
|
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
|
||||||
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
|
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
|
||||||
CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@
|
CONFIG_CXXFLAGS = \
|
||||||
|
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@
|
||||||
|
|
||||||
|
|
||||||
# Warning flags to use.
|
# Warning flags to use.
|
||||||
WARN_CXXFLAGS = @WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
|
WARN_CXXFLAGS = \
|
||||||
|
@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
|
||||||
|
|
||||||
|
|
||||||
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
|
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
|
||||||
|
@ -148,20 +150,38 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
|
||||||
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
||||||
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
|
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(CONFIG_INCLUDES) -I$(top_builddir)/include
|
INCLUDES = \
|
||||||
|
-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include \
|
||||||
|
$(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \
|
||||||
|
$(CONFIG_INCLUDES) -I$(top_builddir)/include
|
||||||
|
|
||||||
|
|
||||||
headers = cxxabi.h exception new typeinfo
|
headers = \
|
||||||
|
cxxabi.h exception new typeinfo
|
||||||
|
|
||||||
|
|
||||||
sources = del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc exception_support.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc vec.cc
|
sources = \
|
||||||
|
del_op.cc \
|
||||||
|
del_opnt.cc \
|
||||||
|
del_opv.cc \
|
||||||
|
del_opvnt.cc \
|
||||||
|
exception_support.cc \
|
||||||
|
new_handler.cc \
|
||||||
|
new_op.cc \
|
||||||
|
new_opnt.cc \
|
||||||
|
new_opv.cc \
|
||||||
|
new_opvnt.cc \
|
||||||
|
pure.cc \
|
||||||
|
tinfo.cc \
|
||||||
|
tinfo2.cc \
|
||||||
|
vec.cc
|
||||||
|
|
||||||
|
|
||||||
libsupc___la_SOURCES = $(sources)
|
libsupc___la_SOURCES = $(sources)
|
||||||
libsupc__convenience_la_SOURCES = $(sources)
|
libsupc__convenience_la_SOURCES = $(sources)
|
||||||
@GXX_INCLUDE_DIR_TRUE@glibcppinstalldir = @gxx_include_dir@
|
@GXX_INCLUDE_DIR_TRUE@glibcppinstalldir = @GXX_INCLUDE_DIR_TRUE@@gxx_include_dir@
|
||||||
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@glibcppinstalldir = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
|
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@glibcppinstalldir = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@$(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
|
||||||
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@glibcppinstalldir = $(prefix)/include/g++-@libstdcxx_interface@
|
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@glibcppinstalldir = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@$(prefix)/include/g++-@libstdcxx_interface@
|
||||||
|
|
||||||
glibcppinstall_HEADERS = $(headers)
|
glibcppinstall_HEADERS = $(headers)
|
||||||
|
|
||||||
|
@ -174,7 +194,12 @@ LIBSUPCXX_CXXFLAGS = -prefer-pic
|
||||||
# set this option because CONFIG_CXXFLAGS has to be after
|
# set this option because CONFIG_CXXFLAGS has to be after
|
||||||
# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
|
# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
|
||||||
# as the occasion call for it. (ie, --enable-debug)
|
# as the occasion call for it. (ie, --enable-debug)
|
||||||
AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS)
|
AM_CXXFLAGS = \
|
||||||
|
-fno-implicit-templates \
|
||||||
|
$(LIBSUPCXX_CXXFLAGS) \
|
||||||
|
$(WARN_CXXFLAGS) \
|
||||||
|
$(OPTIMIZE_CXXFLAGS) \
|
||||||
|
$(CONFIG_CXXFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# libstdc++ libtool notes
|
# libstdc++ libtool notes
|
||||||
|
@ -195,14 +220,16 @@ AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS)
|
||||||
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
|
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
|
||||||
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
|
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
|
||||||
# attempt to infer which configuration to use
|
# attempt to infer which configuration to use
|
||||||
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
|
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
|
||||||
|
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# 3) We have a problem when building the shared libstdc++ object if
|
# 3) We have a problem when building the shared libstdc++ object if
|
||||||
# the rules automake generates would be used. We cannot allow CXX to
|
# the rules automake generates would be used. We cannot allow CXX to
|
||||||
# be used in libtool since this would add -lstdc++ to the link line
|
# be used in libtool since this would add -lstdc++ to the link line
|
||||||
# which of course is problematic at this point.
|
# which of course is problematic at this point.
|
||||||
CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \
|
||||||
|
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
||||||
|
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
||||||
CONFIG_HEADER = ../config.h
|
CONFIG_HEADER = ../config.h
|
||||||
|
|
|
@ -111,12 +111,12 @@ MAINT_CHARSET = latin1
|
||||||
|
|
||||||
# Cross compiler and multilib support.
|
# Cross compiler and multilib support.
|
||||||
# Install a library built with a cross compiler in tooldir, not libdir.
|
# Install a library built with a cross compiler in tooldir, not libdir.
|
||||||
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @gcc_version@
|
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@@gcc_version@
|
||||||
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = $(libdir)/gcc-lib/$(target_alias)
|
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@$(libdir)/gcc-lib/$(target_alias)
|
||||||
@USE_LIBDIR_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
|
@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
|
||||||
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = $(toolexecdir)/$(gcc_version)
|
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@$(toolexecdir)/$(gcc_version)
|
||||||
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
|
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@$(libdir)$(MULTISUBDIR)
|
||||||
@USE_LIBDIR_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
|
||||||
|
|
||||||
toolexeclib_LTLIBRARIES = libstdc++.la
|
toolexeclib_LTLIBRARIES = libstdc++.la
|
||||||
EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
|
EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
|
||||||
|
@ -128,11 +128,13 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
|
||||||
# These bits are all figured out from configure. Look in acinclude.m4
|
# These bits are all figured out from configure. Look in acinclude.m4
|
||||||
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
|
# or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS
|
||||||
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
|
# NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden.
|
||||||
CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@
|
CONFIG_CXXFLAGS = \
|
||||||
|
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@
|
||||||
|
|
||||||
|
|
||||||
# Warning flags to use.
|
# Warning flags to use.
|
||||||
WARN_CXXFLAGS = @WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
|
WARN_CXXFLAGS = \
|
||||||
|
@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
|
||||||
|
|
||||||
|
|
||||||
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
|
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
|
||||||
|
@ -144,35 +146,120 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
|
||||||
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
||||||
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
|
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
|
||||||
|
|
||||||
INCLUDES = -nostdinc++ $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) -I$(top_builddir)/include $(TOPLEVEL_INCLUDES)
|
INCLUDES = \
|
||||||
|
-nostdinc++ \
|
||||||
|
$(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \
|
||||||
|
$(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) -I$(top_builddir)/include \
|
||||||
|
$(TOPLEVEL_INCLUDES)
|
||||||
|
|
||||||
|
|
||||||
base_headers = bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h bits/basic_string.h bits/std_string.h bits/string.tcc bits/generic_shadow.h bits/std_utility.h bits/std_complex.h bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h bits/gslice.h bits/gslice_array.h bits/indirect_array.h bits/exception_support.h bits/std_fstream.h bits/std_iomanip.h bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h bits/std_istream.h bits/istream.tcc bits/std_locale.h bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h bits/streambuf.tcc bits/basic_file.h bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h bits/stl_pthread_alloc.h bits/pthread_allocimpl.h bits/stl_threads.h bits/stl_iterator_base.h bits/std_bitset.h bits/std_deque.h bits/std_functional.h bits/std_iterator.h bits/std_list.h bits/std_map.h bits/std_memory.h bits/std_numeric.h bits/std_queue.h bits/std_set.h bits/std_stack.h bits/std_stdexcept.h bits/std_vector.h bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h bits/stl_deque.h bits/stl_function.h bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h bits/stl_relops.h bits/stl_set.h bits/stl_stack.h bits/stl_string_fwd.h bits/stl_tempbuf.h bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h bits/concept_checks.h bits/container_concepts.h bits/sequence_concepts.h bits/stl_config.h bits/stl_construct.h
|
base_headers = \
|
||||||
|
bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h \
|
||||||
|
bits/basic_string.h bits/std_string.h bits/string.tcc \
|
||||||
|
bits/generic_shadow.h bits/std_utility.h \
|
||||||
|
bits/std_complex.h \
|
||||||
|
bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h \
|
||||||
|
bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h \
|
||||||
|
bits/gslice.h bits/gslice_array.h bits/indirect_array.h \
|
||||||
|
bits/exception_support.h \
|
||||||
|
bits/std_fstream.h bits/std_iomanip.h \
|
||||||
|
bits/ios_base.h bits/fpos.h bits/basic_ios.h bits/basic_ios.tcc \
|
||||||
|
bits/std_ios.h bits/std_iosfwd.h bits/std_iostream.h \
|
||||||
|
bits/std_istream.h bits/istream.tcc bits/std_locale.h \
|
||||||
|
bits/fstream.tcc bits/ostream.tcc bits/sbuf_iter.h bits/sstream.tcc \
|
||||||
|
bits/std_ostream.h bits/std_sstream.h bits/std_streambuf.h \
|
||||||
|
bits/streambuf.tcc bits/basic_file.h \
|
||||||
|
bits/locale_facets.h bits/locale_facets.tcc bits/localefwd.h \
|
||||||
|
bits/stl_pthread_alloc.h bits/pthread_allocimpl.h \
|
||||||
|
bits/stl_threads.h bits/stl_iterator_base.h \
|
||||||
|
bits/std_bitset.h bits/std_deque.h bits/std_functional.h \
|
||||||
|
bits/std_iterator.h bits/std_list.h \
|
||||||
|
bits/std_map.h bits/std_memory.h bits/std_numeric.h \
|
||||||
|
bits/std_queue.h bits/std_set.h bits/std_stack.h \
|
||||||
|
bits/std_stdexcept.h bits/std_vector.h \
|
||||||
|
bits/stl_algo.h bits/stl_algobase.h bits/stl_alloc.h \
|
||||||
|
bits/stl_deque.h bits/stl_function.h \
|
||||||
|
bits/stl_heap.h bits/stl_iterator.h bits/stl_list.h bits/stl_map.h \
|
||||||
|
bits/stl_multimap.h bits/stl_multiset.h bits/stl_numeric.h \
|
||||||
|
bits/stl_pair.h bits/stl_queue.h bits/stl_raw_storage_iter.h \
|
||||||
|
bits/stl_relops.h bits/stl_set.h \
|
||||||
|
bits/stl_stack.h bits/stl_string_fwd.h bits/stl_tempbuf.h \
|
||||||
|
bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h \
|
||||||
|
bits/type_traits.h bits/stl_range_errors.h bits/std_algorithm.h \
|
||||||
|
bits/concept_checks.h bits/container_concepts.h \
|
||||||
|
bits/sequence_concepts.h bits/stl_config.h bits/stl_construct.h
|
||||||
|
|
||||||
|
|
||||||
backward_headers = backward/complex.h backward/iomanip.h backward/istream.h backward/ostream.h backward/stream.h backward/streambuf.h backward/algo.h backward/algobase.h backward/alloc.h backward/bvector.h backward/defalloc.h backward/deque.h backward/function.h backward/hash_map.h backward/hash_set.h backward/hashtable.h backward/heap.h backward/iterator.h backward/list.h backward/map.h backward/multimap.h backward/new.h backward/multiset.h backward/pair.h backward/iostream.h backward/rope.h backward/set.h backward/slist.h backward/stack.h backward/tempbuf.h backward/tree.h backward/vector.h backward/fstream.h backward/strstream.h backward/strstream
|
backward_headers = \
|
||||||
|
backward/complex.h backward/iomanip.h backward/istream.h \
|
||||||
|
backward/ostream.h backward/stream.h backward/streambuf.h \
|
||||||
|
backward/algo.h backward/algobase.h backward/alloc.h \
|
||||||
|
backward/bvector.h backward/defalloc.h backward/deque.h \
|
||||||
|
backward/function.h backward/hash_map.h backward/hash_set.h \
|
||||||
|
backward/hashtable.h backward/heap.h backward/iterator.h \
|
||||||
|
backward/list.h backward/map.h backward/multimap.h backward/new.h \
|
||||||
|
backward/multiset.h backward/pair.h backward/iostream.h \
|
||||||
|
backward/rope.h backward/set.h backward/slist.h backward/stack.h \
|
||||||
|
backward/tempbuf.h backward/tree.h backward/vector.h \
|
||||||
|
backward/fstream.h backward/strstream.h backward/strstream
|
||||||
|
|
||||||
|
|
||||||
ext_headers = ext/ropeimpl.h ext/stl_rope.h ext/stl_bvector.h ext/stl_hashtable.h ext/stl_hash_fun.h ext/hash_map ext/hash_set ext/rope ext/slist ext/tree ext/bvector
|
ext_headers = \
|
||||||
|
ext/ropeimpl.h ext/stl_rope.h \
|
||||||
|
ext/stl_bvector.h ext/stl_hashtable.h ext/stl_hash_fun.h \
|
||||||
|
ext/hash_map ext/hash_set ext/rope ext/slist \
|
||||||
|
ext/tree ext/bvector
|
||||||
|
|
||||||
|
|
||||||
c_base_headers = bits/std_cassert.h bits/std_cctype.h bits/std_cerrno.h bits/std_cfloat.h bits/std_climits.h bits/std_clocale.h bits/std_cmath.h bits/std_csetjmp.h bits/std_csignal.h bits/std_cstdarg.h bits/std_cstddef.h bits/std_cstdio.h bits/std_cstdlib.h bits/std_cstring.h bits/std_ctime.h bits/std_cwchar.h bits/std_cwctype.h bits/cmath.tcc
|
c_base_headers = \
|
||||||
|
bits/std_cassert.h bits/std_cctype.h bits/std_cerrno.h \
|
||||||
|
bits/std_cfloat.h bits/std_climits.h bits/std_clocale.h \
|
||||||
|
bits/std_cmath.h bits/std_csetjmp.h bits/std_csignal.h \
|
||||||
|
bits/std_cstdarg.h bits/std_cstddef.h bits/std_cstdio.h \
|
||||||
|
bits/std_cstdlib.h bits/std_cstring.h bits/std_ctime.h \
|
||||||
|
bits/std_cwchar.h bits/std_cwctype.h bits/cmath.tcc
|
||||||
|
|
||||||
@GLIBCPP_USE_CSHADOW_TRUE@c_shadow_headers = assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h signal.h stdarg.h stddef.h stdio.h stdlib.h string.h time.h wchar.h wctype.h fcntl.h libio.h iolibio.h libioP.h pthread.h iconv.h features.h langinfo.h bits/wrap_libio.h bits/wrap_iolibio.h bits/wrap_libioP.h bits/wrap_iconv.h bits/wrap_fcntl.h bits/wrap_pthread.h bits/wrap_features.h bits/wrap_langinfo.h sys/cdefs.h
|
@GLIBCPP_USE_CSHADOW_TRUE@c_shadow_headers = @GLIBCPP_USE_CSHADOW_TRUE@\
|
||||||
|
@GLIBCPP_USE_CSHADOW_TRUE@ assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h \
|
||||||
|
@GLIBCPP_USE_CSHADOW_TRUE@ signal.h stdarg.h stddef.h stdio.h stdlib.h string.h time.h wchar.h \
|
||||||
|
@GLIBCPP_USE_CSHADOW_TRUE@ wctype.h fcntl.h libio.h iolibio.h libioP.h pthread.h iconv.h \
|
||||||
|
@GLIBCPP_USE_CSHADOW_TRUE@ features.h langinfo.h \
|
||||||
|
@GLIBCPP_USE_CSHADOW_TRUE@ bits/wrap_libio.h bits/wrap_iolibio.h bits/wrap_libioP.h \
|
||||||
|
@GLIBCPP_USE_CSHADOW_TRUE@ bits/wrap_iconv.h bits/wrap_fcntl.h bits/wrap_pthread.h \
|
||||||
|
@GLIBCPP_USE_CSHADOW_TRUE@ bits/wrap_features.h bits/wrap_langinfo.h \
|
||||||
|
@GLIBCPP_USE_CSHADOW_TRUE@ sys/cdefs.h
|
||||||
@GLIBCPP_USE_CSHADOW_FALSE@c_shadow_headers =
|
@GLIBCPP_USE_CSHADOW_FALSE@c_shadow_headers =
|
||||||
|
|
||||||
std_headers = algorithm bitset complex deque fstream functional iomanip ios iosfwd iostream istream iterator limits list locale map memory numeric ostream queue set sstream stack stdexcept streambuf string utility valarray vector cassert cctype cerrno cfloat climits clocale ciso646 cmath csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime cwchar cwctype
|
std_headers = \
|
||||||
|
algorithm bitset complex deque fstream functional \
|
||||||
|
iomanip ios iosfwd iostream istream iterator limits list locale \
|
||||||
|
map memory numeric ostream queue set sstream stack stdexcept \
|
||||||
|
streambuf string utility valarray vector \
|
||||||
|
cassert cctype cerrno cfloat climits clocale ciso646 \
|
||||||
|
cmath csetjmp csignal cstdarg cstddef cstdio cstdlib \
|
||||||
|
cstring ctime cwchar cwctype
|
||||||
|
|
||||||
@GLIBCPP_NEED_LIBIO_TRUE@libio_headers = $(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
|
@GLIBCPP_NEED_LIBIO_TRUE@libio_headers = @GLIBCPP_NEED_LIBIO_TRUE@\
|
||||||
|
@GLIBCPP_NEED_LIBIO_TRUE@ $(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
|
||||||
@GLIBCPP_NEED_LIBIO_FALSE@libio_headers =
|
@GLIBCPP_NEED_LIBIO_FALSE@libio_headers =
|
||||||
|
|
||||||
build_headers = bits/std_limits.h bits/c++config.h bits/c++io.h bits/c++threads.h bits/atomicity.h bits/os_defines.h bits/ctype_base.h bits/ctype_noninline.h bits/ctype_inline.h
|
build_headers = \
|
||||||
|
bits/std_limits.h bits/c++config.h bits/c++io.h bits/c++threads.h \
|
||||||
|
bits/atomicity.h bits/os_defines.h \
|
||||||
|
bits/ctype_base.h bits/ctype_noninline.h bits/ctype_inline.h
|
||||||
|
|
||||||
|
|
||||||
sources = limitsMEMBERS.cc complex.cc complexf.cc complexl.cc complex_io.cc stdexcept.cc bitset.cc c++io.cc ios.cc stdstreams.cc strstream.cc locale.cc localename.cc codecvt.cc locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
|
sources = \
|
||||||
|
limitsMEMBERS.cc \
|
||||||
|
complex.cc complexf.cc complexl.cc complex_io.cc \
|
||||||
|
stdexcept.cc bitset.cc \
|
||||||
|
c++io.cc ios.cc stdstreams.cc strstream.cc \
|
||||||
|
locale.cc localename.cc codecvt.cc \
|
||||||
|
locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
|
||||||
|
|
||||||
|
|
||||||
wstring_sources = wstring-inst.cc
|
wstring_sources = \
|
||||||
|
wstring-inst.cc
|
||||||
|
|
||||||
VPATH = $(top_srcdir) $(top_srcdir)/src $(GLIBCPP_INCLUDE_DIR) $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
|
VPATH = $(top_srcdir) $(top_srcdir)/src $(GLIBCPP_INCLUDE_DIR) $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
|
||||||
|
|
||||||
|
@ -183,17 +270,20 @@ libstdc___la_SOURCES = $(sources)
|
||||||
|
|
||||||
libinst_wstring_la_SOURCES = $(wstring_sources)
|
libinst_wstring_la_SOURCES = $(wstring_sources)
|
||||||
|
|
||||||
libstdc___la_LIBADD = ../libmath/libmath.la @libio_la@ ../libsupc++/libsupc++convenience.la @libinst_wstring_la@
|
libstdc___la_LIBADD = \
|
||||||
|
../libmath/libmath.la @libio_la@ \
|
||||||
|
../libsupc++/libsupc++convenience.la \
|
||||||
|
@libinst_wstring_la@
|
||||||
|
|
||||||
|
|
||||||
libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
|
libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
|
||||||
|
|
||||||
libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
|
libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
|
||||||
@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = $(top_builddir)/stamp-cshadow
|
@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = @GLIBCPP_USE_CSHADOW_TRUE@$(top_builddir)/stamp-cshadow
|
||||||
@GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_H =
|
@GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_H =
|
||||||
@GXX_INCLUDE_DIR_TRUE@myincludep = @gxx_include_dir@
|
@GXX_INCLUDE_DIR_TRUE@myincludep = @GXX_INCLUDE_DIR_TRUE@@gxx_include_dir@
|
||||||
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@myincludep = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
|
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@myincludep = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_TRUE@$(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
|
||||||
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@myincludep = $(prefix)/include/g++-@libstdcxx_interface@
|
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@myincludep = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@$(prefix)/include/g++-@libstdcxx_interface@
|
||||||
|
|
||||||
# NB: As libio_headers may be empty, need this to make sure bash doesn't
|
# NB: As libio_headers may be empty, need this to make sure bash doesn't
|
||||||
# choke on an empty for... loop by using libio_headers_install
|
# choke on an empty for... loop by using libio_headers_install
|
||||||
|
@ -207,7 +297,12 @@ c_incdir = @C_INCLUDE_DIR@
|
||||||
# set this option because CONFIG_CXXFLAGS has to be after
|
# set this option because CONFIG_CXXFLAGS has to be after
|
||||||
# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
|
# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
|
||||||
# as the occasion call for it. (ie, --enable-debug)
|
# as the occasion call for it. (ie, --enable-debug)
|
||||||
AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS)
|
AM_CXXFLAGS = \
|
||||||
|
-fno-implicit-templates \
|
||||||
|
$(LIBSUPCXX_CXXFLAGS) \
|
||||||
|
$(WARN_CXXFLAGS) \
|
||||||
|
$(OPTIMIZE_CXXFLAGS) \
|
||||||
|
$(CONFIG_CXXFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# libstdc++ libtool notes
|
# libstdc++ libtool notes
|
||||||
|
@ -228,14 +323,16 @@ AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS)
|
||||||
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
|
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
|
||||||
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
|
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
|
||||||
# attempt to infer which configuration to use
|
# attempt to infer which configuration to use
|
||||||
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
|
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
|
||||||
|
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# 3) We have a problem when building the shared libstdc++ object if
|
# 3) We have a problem when building the shared libstdc++ object if
|
||||||
# the rules automake generates would be used. We cannot allow CXX to
|
# the rules automake generates would be used. We cannot allow CXX to
|
||||||
# be used in libtool since this would add -lstdc++ to the link line
|
# be used in libtool since this would add -lstdc++ to the link line
|
||||||
# which of course is problematic at this point.
|
# which of course is problematic at this point.
|
||||||
CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \
|
||||||
|
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
||||||
|
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
||||||
CONFIG_HEADER = ../config.h
|
CONFIG_HEADER = ../config.h
|
||||||
|
|
Loading…
Reference in New Issue