Commit eebc608e by Benjamin Kosnik

[multiple changes]


2000-12-12  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>

	* acinclude.m4 (GLIBCPP_CHECK_CTYPE_SUPPORT): Don't link ctype
	files here...
	* configure.in: Rather, do it once for all targets here. Clean up
	canadian cross and cross compile targets for linux-targeted
	crosses.
	* configure: Regenerate.
	* aclocal.m4: Regnerate.
	* acconfig.h: Add more defines.
	* config.h.in: Regenerate.

2000-12-12  Angela Marie Thomas <angela@cygnus.com>

	* configure.in: Fix case for host-x-linux
	* configure: Regenerate.

From-SVN: r38217
parent 29b8e5dd
2000-12-12 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* acinclude.m4 (GLIBCPP_CHECK_CTYPE_SUPPORT): Don't link ctype
files here...
* configure.in: Rather, do it once for all targets here. Clean up
canadian cross and cross compile targets for linux-targeted
crosses.
* configure: Regenerate.
* aclocal.m4: Regnerate.
* acconfig.h: Add more defines.
* config.h.in: Regenerate.
2000-12-12 Angela Marie Thomas <angela@cygnus.com>
* configure.in: Fix case for host-x-linux
* configure: Regenerate.
2000-12-10 Alexandre Petit-Bianco <apbianco@cygnus.com> 2000-12-10 Alexandre Petit-Bianco <apbianco@cygnus.com>
* src/Makefile.am (libstdc++.INC:): 2000-12-05 reverted to include * src/Makefile.am (libstdc++.INC:): 2000-12-05 reverted to include
......
...@@ -135,48 +135,7 @@ MULTICLEAN = true ...@@ -135,48 +135,7 @@ 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 = \ 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)"
"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
......
...@@ -18,6 +18,21 @@ ...@@ -18,6 +18,21 @@
// Define if lldiv_t exists in stdlib.h. // Define if lldiv_t exists in stdlib.h.
#undef HAVE_LLDIV_T #undef HAVE_LLDIV_T
/* Define if you have the atan2f function. */
#define _GLIBCPP_HAVE_ATAN2F 1
/* Define if you have the atan2l function. */
#define _GLIBCPP_HAVE_ATAN2L 1
/* Define if you have the copysignf function. */
#define _GLIBCPP_HAVE_COPYSIGNF 1
/* Define if you have the modff function. */
#undef HAVE_MODFF
/* Define if you have the modfl function. */
#undef HAVE_MODFL
// Define if the compiler/host combination has __builtin_abs // Define if the compiler/host combination has __builtin_abs
#undef HAVE___BUILTIN_ABS #undef HAVE___BUILTIN_ABS
......
...@@ -614,6 +614,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [ ...@@ -614,6 +614,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
dnl Check to see if basic C math functions have float versions. dnl Check to see if basic C math functions have float versions.
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinff) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinff)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysignf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(acosf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(acosf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(asinf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(asinf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(atanf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(atanf)
...@@ -683,6 +684,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [ ...@@ -683,6 +684,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
dnl Check to see if basic C math functions have float versions. dnl Check to see if basic C math functions have float versions.
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_isnanf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_isnanf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_isinff) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_isinff)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(_copysignf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_acosf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_acosf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_asinf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_asinf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_atanf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_atanf)
...@@ -754,8 +756,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [ ...@@ -754,8 +756,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
dnl Check for complex versions of math functions of platform. dnl Check for complex versions of math functions of platform.
AC_CHECK_HEADERS([complex.h]) AC_CHECK_HEADERS([complex.h])
AC_CHECK_LIB(m, main) AC_CHECK_LIB(m, main)
AC_REPLACE_MATHFUNCS(csqrt csqrtf nan hypot hypotf atan2f expf \ AC_REPLACE_MATHFUNCS(csqrt csqrtf nan hypot hypotf)
copysignf)
dnl Compile the long double complex functions only if the function dnl Compile the long double complex functions only if the function
dnl provides the non-complex long double functions that are needed. dnl provides the non-complex long double functions that are needed.
...@@ -963,13 +964,6 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [ ...@@ -963,13 +964,6 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
ctype_include_dir="config/os/generic" ctype_include_dir="config/os/generic"
AC_MSG_WARN("Using default ctype headers.") AC_MSG_WARN("Using default ctype headers.")
fi fi
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h,
include/bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h,
include/bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
include/bits/ctype_noninline.h)
]) ])
]) ])
......
...@@ -626,6 +626,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [ ...@@ -626,6 +626,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
dnl Check to see if basic C math functions have float versions. dnl Check to see if basic C math functions have float versions.
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinff) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinff)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysignf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(acosf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(acosf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(asinf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(asinf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(atanf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(atanf)
...@@ -695,6 +696,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [ ...@@ -695,6 +696,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
dnl Check to see if basic C math functions have float versions. dnl Check to see if basic C math functions have float versions.
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_isnanf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_isnanf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_isinff) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_isinff)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(_copysignf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_acosf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_acosf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_asinf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_asinf)
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_atanf) GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(_atanf)
...@@ -766,8 +768,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [ ...@@ -766,8 +768,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
dnl Check for complex versions of math functions of platform. dnl Check for complex versions of math functions of platform.
AC_CHECK_HEADERS([complex.h]) AC_CHECK_HEADERS([complex.h])
AC_CHECK_LIB(m, main) AC_CHECK_LIB(m, main)
AC_REPLACE_MATHFUNCS(csqrt csqrtf nan hypot hypotf atan2f expf \ AC_REPLACE_MATHFUNCS(csqrt csqrtf nan hypot hypotf)
copysignf)
dnl Compile the long double complex functions only if the function dnl Compile the long double complex functions only if the function
dnl provides the non-complex long double functions that are needed. dnl provides the non-complex long double functions that are needed.
...@@ -975,13 +976,6 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [ ...@@ -975,13 +976,6 @@ AC_DEFUN(GLIBCPP_CHECK_CTYPE_SUPPORT, [
ctype_include_dir="config/os/generic" ctype_include_dir="config/os/generic"
AC_MSG_WARN("Using default ctype headers.") AC_MSG_WARN("Using default ctype headers.")
fi fi
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h,
include/bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h,
include/bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
include/bits/ctype_noninline.h)
]) ])
]) ])
......
...@@ -18,6 +18,12 @@ ...@@ -18,6 +18,12 @@
// Define if lldiv_t exists in stdlib.h. // Define if lldiv_t exists in stdlib.h.
#undef HAVE_LLDIV_T #undef HAVE_LLDIV_T
/* Define if you have the modff function. */
#undef HAVE_MODFF
/* Define if you have the modfl function. */
#undef HAVE_MODFL
// Define if the compiler/host combination has __builtin_abs // Define if the compiler/host combination has __builtin_abs
#undef HAVE___BUILTIN_ABS #undef HAVE___BUILTIN_ABS
...@@ -69,12 +75,6 @@ ...@@ -69,12 +75,6 @@
// Define if LC_MESSAGES is available in <locale.h>. // Define if LC_MESSAGES is available in <locale.h>.
#undef HAVE_LC_MESSAGES #undef HAVE_LC_MESSAGES
// Define if <float.h> exists.
#undef HAVE_FLOAT_H
// Define if modf is present in <math.h>
#undef HAVE_MODF
/* Define if you have the _acosf function. */ /* Define if you have the _acosf function. */
#undef HAVE__ACOSF #undef HAVE__ACOSF
...@@ -108,6 +108,9 @@ ...@@ -108,6 +108,9 @@
/* Define if you have the _copysign function. */ /* Define if you have the _copysign function. */
#undef HAVE__COPYSIGN #undef HAVE__COPYSIGN
/* Define if you have the _copysignf function. */
#undef HAVE__COPYSIGNF
/* Define if you have the _copysignl function. */ /* Define if you have the _copysignl function. */
#undef HAVE__COPYSIGNL #undef HAVE__COPYSIGNL
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -42,18 +42,17 @@ GLIBCPP_ENABLE_THREADS ...@@ -42,18 +42,17 @@ GLIBCPP_ENABLE_THREADS
GLIBCPP_ENABLE_ATOMICITY GLIBCPP_ENABLE_ATOMICITY
GLIBCPP_ENABLE_CXX_FLAGS([none]) GLIBCPP_ENABLE_CXX_FLAGS([none])
if test -n "$with_cross_host"; then if test -n "$with_cross_host"; then
# We are being configured with a cross compiler. AC_REPLACE_FUNCS # We are being configured with a cross compiler. AC_REPLACE_FUNCS
# may not work correctly, because the compiler may not be able to # may not work correctly, because the compiler may not be able to
# link executables. # link executables.
xcompiling=1 xcompiling=1
NATIVE=no NATIVE=no
# If Canadian cross, then don't pick up tools from the build # If Canadian cross, then don't pick up tools from the build
# directory. # directory.
if test "$build" != "$with_cross_host"; then if test x"$build" != x"$with_cross_host" && x"$build" != x"$target"; then
CANADIAN=yes CANADIAN=yes
NULL_TARGET=yes NULL_TARGET=yes
else else
...@@ -62,27 +61,96 @@ if test -n "$with_cross_host"; then ...@@ -62,27 +61,96 @@ if test -n "$with_cross_host"; then
fi fi
case "$target_alias" in case "$target_alias" in
*-wince-*) *-linux-*)
# Configure for Microsoft Windows CE, or whatever they are # Construct linux crosses by hand, eliminating bits that need ld...
# currently calling it. # Check for available headers.
AC_DEFINE(HAVE_FLOAT_H) AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
machine/endian.h machine/param.h sys/machine.h fp.h locale.h \
AC_DEFINE(HAVE__FINITE) float.h inttypes.h])
AC_DEFINE(HAVE__ISNAN)
AC_DEFINE(HAVE__COPYSIGN) # GLIBCPP_CHECK_COMPILER_FEATURES
AC_DEFINE(HAVE__FPCLASS) WFMT_FLAGS='-fdiagnostics-show-location=once'
AC_DEFINE(HAVE_MODF) SECTION_FLAGS='-ffunction-sections -fdata-sections'
AC_SUBST(WFMT_FLAGS)
ctype_include_dir="config/os/wince" AC_SUBST(SECTION_FLAGS)
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, GLIBCPP_CHECK_LINKER_FEATURES
include/bits/ctype_base.h) # GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \ # GLIBCPP_CHECK_MATH_SUPPORT
include/bits/ctype_inline.h) AC_DEFINE(HAVE_ACOSF)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \ AC_DEFINE(HAVE_ASINF)
include/bits/ctype_noninline.h) AC_DEFINE(HAVE_ATAN2F)
AC_DEFINE(HAVE_ATANF)
AC_DEFINE(_GLIBCPP_BUGGY_FLOAT_COMPLEX) AC_DEFINE(HAVE_CEILF)
AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX) AC_DEFINE(HAVE_COPYSIGN)
AC_DEFINE(HAVE_COPYSIGNF)
AC_DEFINE(HAVE_COSF)
AC_DEFINE(HAVE_COSHF)
AC_DEFINE(HAVE_EXPF)
AC_DEFINE(HAVE_FABSF)
AC_DEFINE(HAVE_FINITE)
AC_DEFINE(HAVE_FINITEF)
AC_DEFINE(HAVE_FLOORF)
AC_DEFINE(HAVE_FMODF)
AC_DEFINE(HAVE_FREXPF)
AC_DEFINE(HAVE_ISINF)
AC_DEFINE(HAVE_ISINFF)
AC_DEFINE(HAVE_ISNAN)
AC_DEFINE(HAVE_ISNANF)
AC_DEFINE(HAVE_LDEXPF)
AC_DEFINE(HAVE_LOG10F)
AC_DEFINE(HAVE_LOGF)
AC_DEFINE(HAVE_MODFF)
AC_DEFINE(HAVE_POWF)
AC_DEFINE(HAVE_SINCOS)
AC_DEFINE(HAVE_SINCOSF)
AC_DEFINE(HAVE_SINF)
AC_DEFINE(HAVE_SINHF)
AC_DEFINE(HAVE_SQRTF)
AC_DEFINE(HAVE_TANF)
AC_DEFINE(HAVE_TANHF)
# At some point, we should differentiate between architectures
# like x86, which have long double versions, and alpha/powerpc/etc.,
# which don't. For the time being, punt.
if test x"long_double_math_on_this_cpu" = x"yes"; then
AC_DEFINE(HAVE_ACOSL)
AC_DEFINE(HAVE_ASINL)
AC_DEFINE(HAVE_ATAN2L)
AC_DEFINE(HAVE_ATANL)
AC_DEFINE(HAVE_CEILL)
AC_DEFINE(HAVE_COPYSIGNL)
AC_DEFINE(HAVE_COSL)
AC_DEFINE(HAVE_COSHL)
AC_DEFINE(HAVE_EXPL)
AC_DEFINE(HAVE_FABSL)
AC_DEFINE(HAVE_FINITEL)
AC_DEFINE(HAVE_FLOORL)
AC_DEFINE(HAVE_FMODL)
AC_DEFINE(HAVE_FREXPL)
AC_DEFINE(HAVE_ISINFL)
AC_DEFINE(HAVE_ISNANL)
AC_DEFINE(HAVE_LDEXPL)
AC_DEFINE(HAVE_LOG10L)
AC_DEFINE(HAVE_LOGL)
AC_DEFINE(HAVE_MODFL)
AC_DEFINE(HAVE_POWL)
AC_DEFINE(HAVE_SINCOSL)
AC_DEFINE(HAVE_SINL)
AC_DEFINE(HAVE_SINHL)
AC_DEFINE(HAVE_SQRTL)
AC_DEFINE(HAVE_TANL)
AC_DEFINE(HAVE_TANHL)
fi
GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
GLIBCPP_CHECK_COMPLEX_MATH_COMPILER_SUPPORT
GLIBCPP_CHECK_WCHAR_T_SUPPORT
# GLIBCPP_CHECK_CTYPE_SUPPORT
ctype_include_dir="config/os/gnu-linux"
# GLIBCPP_CHECK_STDLIB_SUPPORT
AC_DEFINE(HAVE_STRTOF)
AC_DEFINE(HAVE_STRTOLD)
# AC_FUNC_MMAP
AC_DEFINE(HAVE_MMAP)
;; ;;
*) *)
# We assume newlib. This lets us hard-code the functions we know # We assume newlib. This lets us hard-code the functions we know
...@@ -94,12 +162,6 @@ if test -n "$with_cross_host"; then ...@@ -94,12 +162,6 @@ if test -n "$with_cross_host"; then
AC_DEFINE(HAVE_ISINFF) AC_DEFINE(HAVE_ISINFF)
ctype_include_dir="config/os/newlib" ctype_include_dir="config/os/newlib"
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h,
include/bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
include/bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
include/bits/ctype_noninline.h)
AC_DEFINE(_GLIBCPP_BUGGY_FLOAT_COMPLEX) AC_DEFINE(_GLIBCPP_BUGGY_FLOAT_COMPLEX)
AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX) AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX)
...@@ -111,7 +173,6 @@ else ...@@ -111,7 +173,6 @@ else
# We are being configured natively. We can do more elaborate tests # We are being configured natively. We can do more elaborate tests
# that include AC_TRY_COMPILE now, as the linker is assumed to be # that include AC_TRY_COMPILE now, as the linker is assumed to be
# working. # working.
xcompiling=0 xcompiling=0
NATIVE=yes NATIVE=yes
CANADIAN=no CANADIAN=no
...@@ -134,6 +195,14 @@ else ...@@ -134,6 +195,14 @@ else
AC_FUNC_MMAP AC_FUNC_MMAP
fi fi
# Now that ctype is determined for all possible targets, we can do this...
AC_LINK_FILES($ctype_include_dir/bits/ctype_base.h, \
include/bits/ctype_base.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_inline.h, \
include/bits/ctype_inline.h)
AC_LINK_FILES($ctype_include_dir/bits/ctype_noninline.h, \
include/bits/ctype_noninline.h)
AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes) AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes)
AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes) AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes)
AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes) AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes)
......
...@@ -110,7 +110,7 @@ libio_la = @libio_la@ ...@@ -110,7 +110,7 @@ libio_la = @libio_la@
libstdcxx_interface = @libstdcxx_interface@ libstdcxx_interface = @libstdcxx_interface@
AUTOMAKE_OPTIONS = 1.3 cygnus AUTOMAKE_OPTIONS = 1.3 cygnus
@GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = @GLIBCPP_BUILD_LIBIO_TRUE@libio.la @GLIBCPP_BUILD_LIBIO_TRUE@noinst_LTLIBRARIES = libio.la
@GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES = @GLIBCPP_BUILD_LIBIO_FALSE@noinst_LTLIBRARIES =
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
...@@ -122,21 +122,14 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ ...@@ -122,21 +122,14 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = \ INCLUDES = -nostdinc++ -I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) $(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
-nostdinc++ \
-I$(top_builddir)/include -I$(GLIBCPP_INCLUDE_DIR) \
$(LIBIO_INCLUDES) $(TOPLEVEL_INCLUDES)
libio_headers = \ libio_headers = libio.h libioP.h iolibio.h
libio.h libioP.h iolibio.h
@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = @GLIBCPP_NEED_LIBIO_TRUE@\ @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@ 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 = @GLIBCPP_NEED_WLIBIO_TRUE@\ @GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = wfiledoalloc.c wfileops.c wgenops.c iofwide.c
@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,24 +113,18 @@ AUTOMAKE_OPTIONS = 1.3 cygnus ...@@ -113,24 +113,18 @@ AUTOMAKE_OPTIONS = 1.3 cygnus
noinst_LTLIBRARIES = libmath.la noinst_LTLIBRARIES = libmath.la
EXTRA_LONG_DOUBLE_yes = \ EXTRA_LONG_DOUBLE_yes = csqrtl.c hypotl.c signbitl.c
csqrtl.c hypotl.c signbitl.c
EXTRA_DIST = \ EXTRA_DIST = csqrt.c csqrtf.c hypot.c hypotf.c atan2f.c expf.c $(EXTRA_LONG_DOUBLE_yes)
csqrt.c csqrtf.c hypot.c hypotf.c atan2f.c expf.c \
$(EXTRA_LONG_DOUBLE_yes)
libmath_la_LIBADD = \ libmath_la_LIBADD = @LIBMATHOBJS@ $(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE))
@LIBMATHOBJS@ \
$(EXTRA_LONG_DOUBLE_$(USE_COMPLEX_LONG_DOUBLE))
libmath_la_DEPENDENCIES = $(libmath_la_LIBADD) libmath_la_DEPENDENCIES = $(libmath_la_LIBADD)
libmath_la_SOURCES = \ libmath_la_SOURCES = signbit.c signbitf.c
signbit.c signbitf.c
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
...@@ -144,9 +138,7 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ ...@@ -144,9 +138,7 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = \ INCLUDES = -I$(GLIBCPP_INCLUDE_DIR) -I$(top_builddir)/include $(TOPLEVEL_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 ...@@ -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 = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@@gcc_version@ @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@gcc_version = @gcc_version@
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@$(libdir)/gcc-lib/$(target_alias) @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexecdir = $(libdir)/gcc-lib/$(target_alias)
@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) @USE_LIBDIR_FALSE@toolexecdir = $(exec_prefix)/$(target_alias)
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@$(toolexecdir)/$(gcc_version) @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_TRUE@toolexeclibdir = $(toolexecdir)/$(gcc_version)
@USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@$(libdir)$(MULTISUBDIR) @USE_LIBDIR_TRUE@@VERSION_SPECIFIC_LIBS_FALSE@toolexeclibdir = $(libdir)$(MULTISUBDIR)
@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) @USE_LIBDIR_FALSE@toolexeclibdir = $(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,13 +132,11 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ ...@@ -132,13 +132,11 @@ 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 = \ CONFIG_CXXFLAGS = @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@
@EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @CSHADOW_FLAGS@ @DEBUG_FLAGS@
# Warning flags to use. # Warning flags to use.
WARN_CXXFLAGS = \ WARN_CXXFLAGS = @WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
@WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
...@@ -150,38 +148,20 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ ...@@ -150,38 +148,20 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
LIBIO_INCLUDES = @LIBIO_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@
CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ CSHADOW_INCLUDES = @CSHADOW_INCLUDES@
INCLUDES = \ INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(CONFIG_INCLUDES) -I$(top_builddir)/include
-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include \
$(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \
$(CONFIG_INCLUDES) -I$(top_builddir)/include
headers = \ headers = cxxabi.h exception new typeinfo
cxxabi.h exception new typeinfo
sources = \ 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
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_TRUE@@gxx_include_dir@ @GXX_INCLUDE_DIR_TRUE@glibcppinstalldir = @gxx_include_dir@
@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_TRUE@glibcppinstalldir = $(libdir)/gcc-lib/$(target_alias)/@gcc_version@/include/g++
@GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@glibcppinstalldir = @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@$(prefix)/include/g++-@libstdcxx_interface@ @GXX_INCLUDE_DIR_FALSE@@VERSION_SPECIFIC_LIBS_FALSE@glibcppinstalldir = $(prefix)/include/g++-@libstdcxx_interface@
glibcppinstall_HEADERS = $(headers) glibcppinstall_HEADERS = $(headers)
...@@ -194,12 +174,7 @@ LIBSUPCXX_CXXFLAGS = -prefer-pic ...@@ -194,12 +174,7 @@ 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 = \ AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS)
-fno-implicit-templates \
$(LIBSUPCXX_CXXFLAGS) \
$(WARN_CXXFLAGS) \
$(OPTIMIZE_CXXFLAGS) \
$(CONFIG_CXXFLAGS)
# libstdc++ libtool notes # libstdc++ libtool notes
...@@ -220,16 +195,14 @@ AM_CXXFLAGS = \ ...@@ -220,16 +195,14 @@ AM_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) \ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
$(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)" \ CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
@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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment