Switch over to new harness.
2001-05-13 Benjamin Kosnik <bkoz@redhat.com> Switch over to new harness. * testsuite_flags.in: Tweaks via Gaby. * testsuite/Makefile.am: Change tool to libstdc++-v3. (EXPECT): Quote directly. (RUNTEST): Same. * configure.in: Output testsuite_flags. * acinclude.m4: Substitute src, bld, and prefix dirs. Remove glibcpp_expect, glibcpp_runtestflags. * Makefile.am (RUNTESTFLAGS): Pass this down to subdirs. * mkcheck.in: Port to new interface. * aclocal.m4: Regerate. * configure: Regnerate. * Makefile.in: Regnerate. * */Makefile.in: Regenerate. * tests_flags.in: Remove. * testsuite/lib/libstdc++.exp: Remove. * testsuite/libstdc++.tests/tests.exp: Remove. From-SVN: r42055
This commit is contained in:
Benjamin Kosnik
Benjamin Kosnik
parent
602928d139
commit
c6192d882f
|
|
@ -1,3 +1,25 @@
|
|||
2001-05-13 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
Switch over to new harness.
|
||||
* testsuite_flags.in: Tweaks via Gaby.
|
||||
* testsuite/Makefile.am: Change tool to libstdc++-v3.
|
||||
(EXPECT): Quote directly.
|
||||
(RUNTEST): Same.
|
||||
* configure.in: Output testsuite_flags.
|
||||
* acinclude.m4: Substitute src, bld, and prefix dirs.
|
||||
Remove glibcpp_expect, glibcpp_runtestflags.
|
||||
* Makefile.am (RUNTESTFLAGS): Pass this down to subdirs.
|
||||
* mkcheck.in: Port to new interface.
|
||||
|
||||
* aclocal.m4: Regerate.
|
||||
* configure: Regnerate.
|
||||
* Makefile.in: Regnerate.
|
||||
* */Makefile.in: Regenerate.
|
||||
|
||||
* tests_flags.in: Remove.
|
||||
* testsuite/lib/libstdc++.exp: Remove.
|
||||
* testsuite/libstdc++.tests/tests.exp: Remove.
|
||||
|
||||
2001-05-13 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
* configure.target: Remove detection of AIX pthread multilib, now
|
||||
|
|
@ -8,6 +30,13 @@
|
|||
* mkcheck.in (setup_size_command): Use Berkeley "-B" mode with GNU
|
||||
size. Add hpux case for HP size.
|
||||
|
||||
2001-05-11 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* testsuite_flags.in: New, simplified interface.
|
||||
* testsuite/lib/libstdc++-v3-dg.exp: New test harness.
|
||||
* testsuite/libstdc++-v3.dg: Add.
|
||||
* testsuite/libstdc++-v3.dg/dg.exp: Add.
|
||||
|
||||
2001-05-11 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* testsuite/*/*.cc: Remove spaces, make sure testcases return zero.
|
||||
|
|
|
|||
|
|
@ -28,23 +28,24 @@ SUBDIRS = libio libmath libsupc++ src testsuite
|
|||
|
||||
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
|
||||
|
||||
# Use $${builddir} instead of $(top_builddir) for arguments to "mkcheck"
|
||||
# because then the paths will be full pathnames, not relative
|
||||
# pathnames. (-Wl,--rpath seems to like this better.)
|
||||
# These two special 'check-script' rules use the bash script 'mkcheck'
|
||||
# to do testing. This script is not as portable as the dejagnu test
|
||||
# harness, and is thus off by default. It does produce interesting
|
||||
# output however, including various performance analysis items like
|
||||
# compile time, execution time, and binary size.
|
||||
check-script: $(top_builddir)/mkcheck
|
||||
-(chmod + $(top_builddir)/mkcheck; \
|
||||
srcdir=`cd $(top_srcdir); pwd`; builddir=`pwd`; \
|
||||
test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \
|
||||
cd testsuite; $${builddir}/mkcheck 0 $${builddir} $${srcdir})
|
||||
cd testsuite; \
|
||||
@glibcpp_builddir@/mkcheck 0)
|
||||
|
||||
check-script-install: $(top_builddir)/mkcheck
|
||||
-(chmod + $(top_builddir)/mkcheck; \
|
||||
srcdir=`cd $(top_srcdir); pwd`; builddir=`pwd`; \
|
||||
test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \
|
||||
cd testsuite; \
|
||||
$${builddir}/mkcheck 1 $${builddir} $${srcdir} $(prefix))
|
||||
@glibcpp_builddir@/mkcheck 1)
|
||||
|
||||
# These two rules seem messy.
|
||||
# These two rules might seem messy, but are hella worth it.
|
||||
doxygen:
|
||||
-(srcdir=`cd ${top_srcdir}; pwd`; \
|
||||
outdir=`pwd`; \
|
||||
|
|
@ -121,6 +122,7 @@ AM_MAKEFLAGS = \
|
|||
"PICFLAG=$(PICFLAG)" \
|
||||
"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
|
||||
"SHELL=$(SHELL)" \
|
||||
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
||||
"exec_prefix=$(exec_prefix)" \
|
||||
"infodir=$(infodir)" \
|
||||
"libdir=$(libdir)" \
|
||||
|
|
|
|||
|
|
@ -107,8 +107,9 @@ enable_shared = @enable_shared@
|
|||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
glibcpp_expect = @glibcpp_expect@
|
||||
glibcpp_runtest = @glibcpp_runtest@
|
||||
glibcpp_builddir = @glibcpp_builddir@
|
||||
glibcpp_prefixdir = @glibcpp_prefixdir@
|
||||
glibcpp_srcdir = @glibcpp_srcdir@
|
||||
glibcpp_toolexecdir = @glibcpp_toolexecdir@
|
||||
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
|
|
@ -137,50 +138,14 @@ MULTICLEAN = true
|
|||
# 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
|
||||
# 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)" \
|
||||
"exec_prefix=$(exec_prefix)" \
|
||||
"infodir=$(infodir)" \
|
||||
"libdir=$(libdir)" \
|
||||
"includedir=$(includedir)" \
|
||||
"prefix=$(prefix)" \
|
||||
"tooldir=$(tooldir)" \
|
||||
"AR=$(AR)" \
|
||||
"AS=$(AS)" \
|
||||
"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)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "includedir=$(includedir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "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
|
||||
CONFIG_HEADER = config.h
|
||||
CONFIG_CLEAN_FILES = tests_flags mkcheck
|
||||
CONFIG_CLEAN_FILES = mkcheck testsuite_flags
|
||||
DIST_COMMON = README ./stamp-h.in ChangeLog Makefile.am Makefile.in \
|
||||
acconfig.h acinclude.m4 aclocal.m4 config.h.in configure configure.in \
|
||||
mkcheck.in tests_flags.in
|
||||
mkcheck.in testsuite_flags.in
|
||||
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
|
@ -231,10 +196,10 @@ distclean-hdr:
|
|||
-rm -f config.h
|
||||
|
||||
maintainer-clean-hdr:
|
||||
tests_flags: $(top_builddir)/config.status tests_flags.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
mkcheck: $(top_builddir)/config.status mkcheck.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
testsuite_flags: $(top_builddir)/config.status testsuite_flags.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
# This directory's subdirectories are mostly independent; you can cd
|
||||
# into them and run `make' without going through this Makefile.
|
||||
|
|
@ -446,23 +411,24 @@ distclean-generic clean-generic maintainer-clean-generic clean \
|
|||
mostlyclean distclean maintainer-clean
|
||||
|
||||
|
||||
# Use $${builddir} instead of $(top_builddir) for arguments to "mkcheck"
|
||||
# because then the paths will be full pathnames, not relative
|
||||
# pathnames. (-Wl,--rpath seems to like this better.)
|
||||
# These two special 'check-script' rules use the bash script 'mkcheck'
|
||||
# to do testing. This script is not as portable as the dejagnu test
|
||||
# harness, and is thus off by default. It does produce interesting
|
||||
# output however, including various performance analysis items like
|
||||
# compile time, execution time, and binary size.
|
||||
check-script: $(top_builddir)/mkcheck
|
||||
-(chmod + $(top_builddir)/mkcheck; \
|
||||
srcdir=`cd $(top_srcdir); pwd`; builddir=`pwd`; \
|
||||
test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \
|
||||
cd testsuite; $${builddir}/mkcheck 0 $${builddir} $${srcdir})
|
||||
cd testsuite; \
|
||||
@glibcpp_builddir@/mkcheck 0)
|
||||
|
||||
check-script-install: $(top_builddir)/mkcheck
|
||||
-(chmod + $(top_builddir)/mkcheck; \
|
||||
srcdir=`cd $(top_srcdir); pwd`; builddir=`pwd`; \
|
||||
test -d testsuite || (mkdir testsuite; chmod u+w testsuite); \
|
||||
cd testsuite; \
|
||||
$${builddir}/mkcheck 1 $${builddir} $${srcdir} $(prefix))
|
||||
@glibcpp_builddir@/mkcheck 1)
|
||||
|
||||
# These two rules seem messy.
|
||||
# These two rules might seem messy, but are hella worth it.
|
||||
doxygen:
|
||||
-(srcdir=`cd ${top_srcdir}; pwd`; \
|
||||
outdir=`pwd`; \
|
||||
|
|
|
|||
|
|
@ -117,10 +117,6 @@ LIB_AC_PROG_CXX
|
|||
AC_CHECK_TOOL(AS, as)
|
||||
AC_CHECK_TOOL(AR, ar)
|
||||
AC_CHECK_TOOL(RANLIB, ranlib, ranlib-not-found-in-path-error)
|
||||
AC_CHECK_TOOL(glibcpp_expect, expect, expect-not-found-in-path-error)
|
||||
AC_CHECK_TOOL(glibcpp_runtest, runtest, runtest-not-found-in-path-error)
|
||||
AC_SUBST(glibcpp_expect)
|
||||
AC_SUBST(glibcpp_runtest)
|
||||
AC_PROG_INSTALL
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
|
|
@ -1581,6 +1577,12 @@ AC_DEFUN(GLIBCPP_EXPORT_INSTALL_INFO, [
|
|||
glibcpp_toolexecdir=no
|
||||
glibcpp_toolexeclibdir=no
|
||||
|
||||
# Export build and source directories.
|
||||
tmp_builddir=`pwd`
|
||||
glibcpp_builddir=$tmp_builddir
|
||||
glibcpp_srcdir=${srcdir}
|
||||
glibcpp_prefixdir=${prefix}
|
||||
|
||||
AC_MSG_CHECKING([for interface version number])
|
||||
libstdcxx_interface=$INTERFACE
|
||||
AC_MSG_RESULT($libstdcxx_interface)
|
||||
|
|
@ -1643,6 +1645,9 @@ fi
|
|||
AC_MSG_CHECKING([for install location])
|
||||
AC_MSG_RESULT($gxx_include_dir)
|
||||
|
||||
AC_SUBST(glibcpp_builddir)
|
||||
AC_SUBST(glibcpp_srcdir)
|
||||
AC_SUBST(glibcpp_prefixdir)
|
||||
AC_SUBST(gxx_include_dir)
|
||||
AC_SUBST(glibcpp_toolexecdir)
|
||||
AC_SUBST(glibcpp_toolexeclibdir)
|
||||
|
|
|
|||
|
|
@ -129,10 +129,6 @@ LIB_AC_PROG_CXX
|
|||
AC_CHECK_TOOL(AS, as)
|
||||
AC_CHECK_TOOL(AR, ar)
|
||||
AC_CHECK_TOOL(RANLIB, ranlib, ranlib-not-found-in-path-error)
|
||||
AC_CHECK_TOOL(glibcpp_expect, expect, expect-not-found-in-path-error)
|
||||
AC_CHECK_TOOL(glibcpp_runtest, runtest, runtest-not-found-in-path-error)
|
||||
AC_SUBST(glibcpp_expect)
|
||||
AC_SUBST(glibcpp_runtest)
|
||||
AC_PROG_INSTALL
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
|
|
@ -1593,6 +1589,12 @@ AC_DEFUN(GLIBCPP_EXPORT_INSTALL_INFO, [
|
|||
glibcpp_toolexecdir=no
|
||||
glibcpp_toolexeclibdir=no
|
||||
|
||||
# Export build and source directories.
|
||||
tmp_builddir=`pwd`
|
||||
glibcpp_builddir=$tmp_builddir
|
||||
glibcpp_srcdir=${srcdir}
|
||||
glibcpp_prefixdir=${prefix}
|
||||
|
||||
AC_MSG_CHECKING([for interface version number])
|
||||
libstdcxx_interface=$INTERFACE
|
||||
AC_MSG_RESULT($libstdcxx_interface)
|
||||
|
|
@ -1655,6 +1657,9 @@ fi
|
|||
AC_MSG_CHECKING([for install location])
|
||||
AC_MSG_RESULT($gxx_include_dir)
|
||||
|
||||
AC_SUBST(glibcpp_builddir)
|
||||
AC_SUBST(glibcpp_srcdir)
|
||||
AC_SUBST(glibcpp_prefixdir)
|
||||
AC_SUBST(gxx_include_dir)
|
||||
AC_SUBST(glibcpp_toolexecdir)
|
||||
AC_SUBST(glibcpp_toolexeclibdir)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -281,14 +281,14 @@ fi
|
|||
# installed in the correct place. To work around this not being passed
|
||||
# down from config-ml.in -> top_srcdir/Makefile.am ->
|
||||
# top_srcdir/{src,libsupc++}/Makefile.am, manually append it here.
|
||||
AC_OUTPUT(tests_flags mkcheck Makefile src/Makefile libmath/Makefile libio/Makefile libsupc++/Makefile testsuite/Makefile,
|
||||
AC_OUTPUT(Makefile src/Makefile libmath/Makefile libio/Makefile libsupc++/Makefile testsuite/Makefile mkcheck testsuite_flags,
|
||||
[if test -n "$CONFIG_FILES"; then
|
||||
ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
|
||||
grep '^MULTISUBDIR =' Makefile >> src/Makefile
|
||||
grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
|
||||
fi
|
||||
chmod +x tests_flags
|
||||
chmod +x mkcheck
|
||||
chmod +x testsuite_flags
|
||||
],
|
||||
srcdir=${srcdir}
|
||||
host=${host}
|
||||
|
|
|
|||
|
|
@ -101,8 +101,9 @@ enable_shared = @enable_shared@
|
|||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
glibcpp_expect = @glibcpp_expect@
|
||||
glibcpp_runtest = @glibcpp_runtest@
|
||||
glibcpp_builddir = @glibcpp_builddir@
|
||||
glibcpp_prefixdir = @glibcpp_prefixdir@
|
||||
glibcpp_srcdir = @glibcpp_srcdir@
|
||||
glibcpp_toolexecdir = @glibcpp_toolexecdir@
|
||||
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
|
|
@ -113,7 +114,7 @@ toplevel_srcdir = @toplevel_srcdir@
|
|||
AUTOMAKE_OPTIONS = 1.3 cygnus
|
||||
|
||||
mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
|
||||
@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 =
|
||||
|
||||
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
|
||||
|
|
@ -125,21 +126,14 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
|
|||
LIBIO_INCLUDES = @LIBIO_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 = @GLIBCPP_NEED_LIBIO_TRUE@\
|
||||
@GLIBCPP_NEED_LIBIO_TRUE@ filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c \
|
||||
@GLIBCPP_NEED_LIBIO_TRUE@ iofclose.c iofopen.c
|
||||
@GLIBCPP_NEED_LIBIO_TRUE@LIBIO_SRCS = filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c iofclose.c iofopen.c
|
||||
@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS =
|
||||
@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_TRUE@LIBIO_WSRCS = wfiledoalloc.c wfileops.c wgenops.c iofwide.c
|
||||
@GLIBCPP_NEED_WLIBIO_FALSE@LIBIO_WSRCS =
|
||||
|
||||
EXTRA_DIST = iostreamP.h
|
||||
|
|
|
|||
|
|
@ -101,8 +101,9 @@ enable_shared = @enable_shared@
|
|||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
glibcpp_expect = @glibcpp_expect@
|
||||
glibcpp_runtest = @glibcpp_runtest@
|
||||
glibcpp_builddir = @glibcpp_builddir@
|
||||
glibcpp_prefixdir = @glibcpp_prefixdir@
|
||||
glibcpp_srcdir = @glibcpp_srcdir@
|
||||
glibcpp_toolexecdir = @glibcpp_toolexecdir@
|
||||
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
|
|
@ -116,24 +117,18 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
|
|||
|
||||
noinst_LTLIBRARIES = libmath.la
|
||||
|
||||
EXTRA_LONG_DOUBLE_yes = \
|
||||
hypotl.c signbitl.c
|
||||
EXTRA_LONG_DOUBLE_yes = hypotl.c signbitl.c
|
||||
|
||||
|
||||
EXTRA_DIST = \
|
||||
hypot.c hypotf.c atan2f.c expf.c \
|
||||
$(EXTRA_LONG_DOUBLE_yes)
|
||||
EXTRA_DIST = 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_SOURCES = \
|
||||
signbit.c signbitf.c
|
||||
libmath_la_SOURCES = signbit.c signbitf.c
|
||||
|
||||
|
||||
LINK = $(LIBTOOL) --mode=link "$(CCLD)" $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||
|
|
@ -147,9 +142,7 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
|
|||
LIBIO_INCLUDES = @LIBIO_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)
|
||||
|
||||
CONFIG_HEADER = ../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
|
|
|
|||
|
|
@ -98,8 +98,9 @@ enable_shared = @enable_shared@
|
|||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
glibcpp_expect = @glibcpp_expect@
|
||||
glibcpp_runtest = @glibcpp_runtest@
|
||||
glibcpp_builddir = @glibcpp_builddir@
|
||||
glibcpp_prefixdir = @glibcpp_prefixdir@
|
||||
glibcpp_srcdir = @glibcpp_srcdir@
|
||||
glibcpp_toolexecdir = @glibcpp_toolexecdir@
|
||||
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
|
|
@ -131,13 +132,11 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
|
|||
# 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
|
||||
# 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.
|
||||
WARN_CXXFLAGS = \
|
||||
@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
|
||||
WARN_CXXFLAGS = @WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
|
||||
|
||||
|
||||
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
|
||||
|
|
@ -149,38 +148,13 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
|
|||
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
||||
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
|
||||
|
||||
INCLUDES = \
|
||||
-I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include \
|
||||
-I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include \
|
||||
$(LIBSUPCXX_INCLUDES)
|
||||
INCLUDES = -I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include -I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include $(LIBSUPCXX_INCLUDES)
|
||||
|
||||
|
||||
headers = \
|
||||
exception new typeinfo cxxabi.h exception_defines.h
|
||||
headers = exception new typeinfo cxxabi.h exception_defines.h
|
||||
|
||||
|
||||
sources = \
|
||||
del_op.cc \
|
||||
del_opnt.cc \
|
||||
del_opv.cc \
|
||||
del_opvnt.cc \
|
||||
eh_alloc.cc \
|
||||
eh_aux_runtime.cc \
|
||||
eh_catch.cc \
|
||||
eh_exception.cc \
|
||||
eh_globals.cc \
|
||||
eh_personality.cc \
|
||||
eh_terminate.cc \
|
||||
eh_throw.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 eh_alloc.cc eh_aux_runtime.cc eh_catch.cc eh_exception.cc eh_globals.cc eh_personality.cc eh_terminate.cc eh_throw.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)
|
||||
|
|
@ -196,12 +170,7 @@ LIBSUPCXX_CXXFLAGS = $(LIBSUPCXX_PICFLAGS)
|
|||
# set this option because CONFIG_CXXFLAGS has to be after
|
||||
# OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden
|
||||
# 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
|
||||
|
|
@ -225,9 +194,7 @@ AM_CXXFLAGS = \
|
|||
#
|
||||
# We have to put --tag disable-shared after --tag CXX lest things
|
||||
# CXX undo the affect of disable-shared.
|
||||
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
|
||||
--mode=compile $(CXX) $(INCLUDES) \
|
||||
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
|
||||
LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared --mode=compile $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
|
||||
|
||||
|
||||
# 3) We'd have a problem when building the shared libstdc++ object if
|
||||
|
|
@ -236,9 +203,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
|
|||
# course is problematic at this point. So, we get the top-level
|
||||
# directory to configure libstdc++-v3 to use gcc as the C++
|
||||
# compilation driver.
|
||||
CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
|
||||
--mode=link $(CXX) \
|
||||
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
||||
CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared --mode=link $(CXX) @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
CONFIG_HEADER = ../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env bash
|
||||
!/usr/bin/env bash
|
||||
|
||||
|
||||
# Script to do automated testing and data collection for various test
|
||||
|
|
@ -9,16 +9,7 @@
|
|||
# has been enabled.
|
||||
|
||||
# Invocation
|
||||
# mkcheck [01] (path to build) (path to src) (path to install)
|
||||
|
||||
### XXX There are a lot of tests in here for OS-specific stuff. If we
|
||||
### move to a 'configure.target' method of determining those extra
|
||||
### flags and whatnot, we can take out all those things and source
|
||||
### that file from here. (Write that file with this in mind...)
|
||||
|
||||
### XXX Note that breaking out of this with ^C will not work under
|
||||
### Solaris (at least). Dunno why.
|
||||
|
||||
# mkcheck [01]
|
||||
|
||||
# 1: variables
|
||||
#
|
||||
|
|
@ -26,17 +17,15 @@
|
|||
# (0) testing the build binary and headers, or
|
||||
# (1) testing the installed binary and headers, or
|
||||
WHICH=$1
|
||||
if [ "$WHICH"x = 0x ] && [ $# -eq 3 ]; then
|
||||
if [ "$WHICH"x = 0x ]; then
|
||||
echo "running mkcheck"
|
||||
echo "$0: testing the build directory"
|
||||
query="--built-library"
|
||||
elif [ "$WHICH"x = 1x ] && [ $# -eq 4 ]; then
|
||||
elif [ "$WHICH"x = 1x ]; then
|
||||
echo "running mkcheck"
|
||||
echo "$0: testing the install directory $4"
|
||||
query="--installed-library"
|
||||
echo "$0: testing the install directory"
|
||||
else
|
||||
echo 'Usage: mkcheck 0 (path to build) (path to src)'
|
||||
echo ' mkcheck 1 (path to build) (path to src) (path to install)'
|
||||
echo 'Usage: mkcheck 0'
|
||||
echo ' mkcheck 1'
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
|
|
@ -50,32 +39,32 @@ case $BASH_VERSION in
|
|||
*) ;; # ??
|
||||
esac
|
||||
|
||||
# Compute the flags necessary to run the testsuite.
|
||||
saved_ifs=$IFS
|
||||
# bash 2.01 does the wrong thing with $* if IFS doesn't include space
|
||||
if test ${BASH_VERSINFO[1]} = 01 ; then
|
||||
IFS=': '
|
||||
BUILD_DIR=@glibcpp_builddir@
|
||||
SRC_DIR=@glibcpp_srcdir@
|
||||
PREFIX_DIR=@glibcpp_prefixdir@
|
||||
if [ "$WHICH"x = 0x ]; then
|
||||
CXX=`$BUILD_DIR/testsuite_flags --build-cxx`
|
||||
INCLUDES=`$BUILD_DIR/testsuite_flags --build-includes`
|
||||
else
|
||||
IFS=':'
|
||||
CXX=`$BUILD_DIR/testsuite_flags --install-cxx`
|
||||
INCLUDES=`$BUILD_DIR/testsuite_flags --install-includes`
|
||||
fi
|
||||
set `../tests_flags ${query} $*` || exit 1
|
||||
BUILD_DIR=$1; SRC_DIR=$2; PREFIX_DIR=$3; CXX=$4; CXXFLAGS=$5; INCLUDES=$6; LIBS=$7;
|
||||
IFS=$saved_ifs
|
||||
|
||||
CXXFLAGS=`$BUILD_DIR/testsuite_flags --cxxflags`
|
||||
LIBTOOL="$BUILD_DIR/libtool"
|
||||
LTEXE="$LIBTOOL --mode=execute"
|
||||
LTCXX="$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $INCLUDES $LIBS"
|
||||
#LTCXX="$LIBTOOL --tag=CXX --mode=link $CXX $CXXFLAGS $INCLUDES"
|
||||
LTCXX="$CXX $CXXFLAGS $INCLUDES"
|
||||
|
||||
# specific libtool flag(s) to force the use of shared libraries, if any
|
||||
SH_FLAG=
|
||||
# specific libtool flag(s) to use shared libraries, if any
|
||||
SH_FLAG="-Wl,--rpath -Wl,$BUILD_DIR/../../gcc -Wl,--rpath -Wl,$BUILD_DIR/src/.libs"
|
||||
|
||||
# specific libtool flag(s) to force the use of static libraries, if any
|
||||
# specific libtool flag(s) to use static libraries, if any
|
||||
ST_FLAG="-static"
|
||||
#ST_FLAG="-all-static"
|
||||
|
||||
# Set up the testing directory, which should be in a directory called
|
||||
# "testsuite" in the root level of the build directory.
|
||||
TEST_DIR='.'
|
||||
TEST_DIR="$BUILD_DIR/testsuite"
|
||||
# help libtool keep quiet
|
||||
if [ ! -d ${TEST_DIR}/.libs ]; then
|
||||
mkdir $TEST_DIR/.libs
|
||||
|
|
@ -330,6 +319,7 @@ test_file()
|
|||
# eventually have to calculate time_t anyhow. Or 3) just grab two
|
||||
# time_t's (no more overhead than grabbing two date(1)'s).
|
||||
compiler_invocation="$LTCXX $S_FLAG $SRC_NAME -o $EXENAME"
|
||||
echo $compiler_invocation >> compile.out 2>&1
|
||||
COMP_TIME_START=$($TIMER_COMMAND)
|
||||
$compiler_invocation >> compile.out 2>&1
|
||||
COMP_TIME_END=$($TIMER_COMMAND)
|
||||
|
|
@ -341,7 +331,7 @@ test_file()
|
|||
fi
|
||||
|
||||
if [ -f $EXENAME ]; then
|
||||
rm compile.out
|
||||
# rm compile.out
|
||||
size_command TEXT
|
||||
size_command DATA
|
||||
size_command SIZE
|
||||
|
|
@ -379,8 +369,8 @@ test_file()
|
|||
else
|
||||
# the file did not compile/link.
|
||||
printf "\n" >> $LOG_FILE
|
||||
`cat compile.out >> $LOG_FILE`
|
||||
rm compile.out
|
||||
# `cat compile.out >> $LOG_FILE`
|
||||
# rm compile.out
|
||||
RESULT="-b"
|
||||
TEXT="0"
|
||||
DATA="0"
|
||||
|
|
@ -463,5 +453,3 @@ if [ $TEST_TIME_START -lt $TEST_TIME_END ]; then
|
|||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -97,8 +97,9 @@ enable_shared = @enable_shared@
|
|||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
glibcpp_expect = @glibcpp_expect@
|
||||
glibcpp_runtest = @glibcpp_runtest@
|
||||
glibcpp_builddir = @glibcpp_builddir@
|
||||
glibcpp_prefixdir = @glibcpp_prefixdir@
|
||||
glibcpp_srcdir = @glibcpp_srcdir@
|
||||
glibcpp_toolexecdir = @glibcpp_toolexecdir@
|
||||
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
|
||||
ifGNUmake = @ifGNUmake@
|
||||
|
|
@ -123,13 +124,11 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@
|
|||
# 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
|
||||
# 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.
|
||||
WARN_CXXFLAGS = \
|
||||
@WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
|
||||
WARN_CXXFLAGS = @WARN_FLAGS@ $(WERROR) -fdiagnostics-show-location=once
|
||||
|
||||
|
||||
# Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES
|
||||
|
|
@ -141,132 +140,44 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
|
|||
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
||||
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
|
||||
|
||||
INCLUDES = \
|
||||
-nostdinc++ \
|
||||
-I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include \
|
||||
$(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \
|
||||
$(TOPLEVEL_INCLUDES)
|
||||
INCLUDES = -nostdinc++ -I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include $(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) $(TOPLEVEL_INCLUDES)
|
||||
|
||||
|
||||
base_headers = \
|
||||
bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h \
|
||||
bits/stringfwd.h bits/std_string.h bits/basic_string.h \
|
||||
bits/basic_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/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_types.h bits/stl_iterator_base_funcs.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/functexcept.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_tempbuf.h \
|
||||
bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h \
|
||||
bits/stl_bvector.h bits/type_traits.h bits/std_algorithm.h \
|
||||
bits/stl_construct.h bits/boost_concept_check.h bits/concept_check.h
|
||||
base_headers = bits/cpp_type_traits.h bits/char_traits.h bits/codecvt.h bits/stringfwd.h bits/std_string.h bits/basic_string.h bits/basic_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/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_types.h bits/stl_iterator_base_funcs.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/functexcept.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_tempbuf.h bits/stl_tree.h bits/stl_uninitialized.h bits/stl_vector.h bits/stl_bvector.h bits/type_traits.h bits/std_algorithm.h bits/stl_construct.h bits/boost_concept_check.h bits/concept_check.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/iostream.h \
|
||||
backward/iterator.h backward/list.h backward/map.h \
|
||||
backward/multimap.h backward/new.h backward/multiset.h \
|
||||
backward/pair.h backward/queue.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/backward_warning.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/iostream.h backward/iterator.h backward/list.h backward/map.h backward/multimap.h backward/new.h backward/multiset.h backward/pair.h backward/queue.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/backward_warning.h
|
||||
|
||||
|
||||
ext_headers = \
|
||||
ext/rope ext/ropeimpl.h ext/stl_rope.h \
|
||||
ext/slist ext/hash_map ext/hash_set \
|
||||
ext/stl_hashtable.h ext/stl_hash_fun.h
|
||||
ext_headers = ext/rope ext/ropeimpl.h ext/stl_rope.h ext/slist ext/hash_map ext/hash_set ext/stl_hashtable.h ext/stl_hash_fun.h
|
||||
|
||||
|
||||
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 = @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_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_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 = @GLIBCPP_NEED_LIBIO_TRUE@\
|
||||
@GLIBCPP_NEED_LIBIO_TRUE@ $(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
|
||||
@GLIBCPP_NEED_LIBIO_TRUE@libio_headers = $(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h
|
||||
@GLIBCPP_NEED_LIBIO_FALSE@libio_headers =
|
||||
|
||||
build_headers = \
|
||||
bits/std_limits.h \
|
||||
bits/c++config.h bits/c++io.h bits/c++locale.h bits/c++threads.h \
|
||||
bits/basic_file_model.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++locale.h bits/c++threads.h bits/basic_file_model.h bits/atomicity.h bits/os_defines.h bits/ctype_base.h bits/ctype_noninline.h bits/ctype_inline.h
|
||||
|
||||
|
||||
sources = \
|
||||
limitsMEMBERS.cc \
|
||||
stdexcept.cc functexcept.cc bitset.cc \
|
||||
globals.cc \
|
||||
basic_file.cc ios.cc complex_io.cc strstream.cc \
|
||||
c++locale.cc locale.cc localename.cc codecvt.cc \
|
||||
locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc \
|
||||
string-inst.cc wstring-inst.cc
|
||||
sources = limitsMEMBERS.cc stdexcept.cc functexcept.cc bitset.cc globals.cc basic_file.cc ios.cc complex_io.cc strstream.cc c++locale.cc locale.cc localename.cc codecvt.cc locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc wstring-inst.cc
|
||||
|
||||
VPATH = $(top_srcdir) $(top_srcdir)/src $(GLIBCPP_INCLUDE_DIR) $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
|
||||
|
||||
libstdc___la_SOURCES = $(sources)
|
||||
|
||||
libstdc___la_LIBADD = \
|
||||
../libmath/libmath.la @libio_la@ \
|
||||
../libsupc++/libsupc++convenience.la
|
||||
libstdc___la_LIBADD = ../libmath/libmath.la @libio_la@ ../libsupc++/libsupc++convenience.la
|
||||
|
||||
|
||||
libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
|
||||
|
||||
libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD)
|
||||
@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = @GLIBCPP_USE_CSHADOW_TRUE@$(top_builddir)/stamp-cshadow
|
||||
@GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_H = $(top_builddir)/stamp-cshadow
|
||||
@GLIBCPP_USE_CSHADOW_FALSE@CSHADOW_H =
|
||||
|
||||
# Check for various configure bits that change where the headers get installed.
|
||||
|
|
@ -289,12 +200,7 @@ c_incdir = @C_INCLUDE_DIR@
|
|||
# The no-implicit-templates flag will generate unresolved references to
|
||||
# the concept-checking symbols. So we must disable the checks while
|
||||
# actually building the library.
|
||||
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
|
||||
|
|
@ -315,8 +221,7 @@ AM_CXXFLAGS = \
|
|||
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
|
||||
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
|
||||
# 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'd have a problem when building the shared libstdc++ object if
|
||||
|
|
@ -325,8 +230,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
|
|||
# course is problematic at this point. So, we get the top-level
|
||||
# directory to configure libstdc++-v3 to use gcc as the C++
|
||||
# compilation driver.
|
||||
CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
|
||||
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
||||
CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
CONFIG_HEADER = ../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
|
|
|
|||
|
|
@ -23,12 +23,15 @@
|
|||
|
||||
AUTOMAKE_OPTIONS = foreign dejagnu
|
||||
|
||||
DEJATOOL = libstdc++
|
||||
|
||||
EXPECT = @glibcpp_expect@
|
||||
|
||||
RUNTEST = @glibcpp_runtest@
|
||||
DEJATOOL = libstdc++-v3
|
||||
|
||||
EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then \
|
||||
echo @glibcpp_builddir@/../../expect/expect ; \
|
||||
else echo expect ; fi`
|
||||
|
||||
RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \
|
||||
echo @glibcpp_srcdir@/../dejagnu/runtest ; \
|
||||
else echo runtest; fi`
|
||||
|
||||
RUNTESTFLAGS =
|
||||
|
||||
|
|
|
|||
|
|
@ -107,8 +107,9 @@ enable_shared = @enable_shared@
|
|||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
glibcpp_basedir = @glibcpp_basedir@
|
||||
glibcpp_expect = @glibcpp_expect@
|
||||
glibcpp_runtest = @glibcpp_runtest@
|
||||
glibcpp_builddir = @glibcpp_builddir@
|
||||
glibcpp_prefixdir = @glibcpp_prefixdir@
|
||||
glibcpp_srcdir = @glibcpp_srcdir@
|
||||
glibcpp_toolexecdir = @glibcpp_toolexecdir@
|
||||
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
|
|
@ -118,11 +119,15 @@ toplevel_srcdir = @toplevel_srcdir@
|
|||
|
||||
AUTOMAKE_OPTIONS = foreign dejagnu
|
||||
|
||||
DEJATOOL = libstdc++
|
||||
DEJATOOL = libstdc++-v3
|
||||
|
||||
EXPECT = @glibcpp_expect@
|
||||
EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then echo @glibcpp_builddir@/../../expect/expect ; else echo expect ; fi`
|
||||
|
||||
RUNTEST = @glibcpp_runtest@
|
||||
|
||||
RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then echo @glibcpp_srcdir@/../dejagnu/runtest ; else echo runtest; fi`
|
||||
|
||||
|
||||
RUNTESTFLAGS =
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
||||
CONFIG_HEADER = ../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
|
|
@ -162,8 +167,6 @@ distdir: $(DISTFILES)
|
|||
fi; \
|
||||
done
|
||||
|
||||
RUNTESTFLAGS =
|
||||
|
||||
RUNTESTDEFAULTFLAGS = --tool $(DEJATOOL) --srcdir $$srcdir
|
||||
|
||||
check-DEJAGNU: site.exp
|
||||
|
|
|
|||
|
|
@ -108,6 +108,10 @@ proc libstdc++-v3_target_compile { source dest type options } {
|
|||
set cxx_final [concat $cxx_final $cxxlibglossflags]
|
||||
set cxx_final [concat $cxx_final $cxxflags]
|
||||
set cxx_final [concat $cxx_final $includes]
|
||||
|
||||
# XXX
|
||||
set cxx_final [concat $cxx_final -static]
|
||||
|
||||
lappend options "compiler=$cxx_final";
|
||||
|
||||
return [target_compile $source $dest $type $options]
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
# Copyright (C) 2001 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
# Please email any bugs, comments, and/or additions to this file to:
|
||||
# libstdc++@gcc.gnu.org
|
||||
#
|
||||
# This file is contributed by Gabriel Dos Reis <gdr@codesourcery.com>
|
||||
|
||||
load_lib libstdc++.exp
|
||||
|
||||
## Initialize the framework.
|
||||
libstdc++-dg-init
|
||||
|
||||
## Set ulimits. This should normally be handled on test-by-test
|
||||
## basis through @xxx@-keywords.
|
||||
## The following limit is expressed in kilobytes. For history, Have a
|
||||
## look at http://gcc.gnu.org/ml/libstdc++/2000-10/msg00029.html
|
||||
set maximum-memory-usage 16384
|
||||
set shell-ulimit-command ulimit
|
||||
remote_exec host ${shell-ulimit-command} "-d ${maximum-memory-usage}"
|
||||
remote_exec host ${shell-ulimit-command} "-v ${maximum-memory-usage}"
|
||||
|
||||
## Now, do the work directory by directory
|
||||
libstdc++-runtest [glob -nocomplain $srcdir/*]
|
||||
dg-finish
|
||||
|
||||
|
||||
|
|
@ -12,11 +12,11 @@
|
|||
print_usage() {
|
||||
cat <<EOF
|
||||
Usage:
|
||||
tests_flags --install-includes
|
||||
--build-includes
|
||||
--build-cxx
|
||||
--install-cxx
|
||||
--cxxflags
|
||||
testsuite_flags --install-includes
|
||||
--build-includes
|
||||
--build-cxx
|
||||
--install-cxx
|
||||
--cxxflags
|
||||
EOF
|
||||
}
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ case ${query} in
|
|||
echo ${CXX}
|
||||
;;
|
||||
--build-cxx)
|
||||
CC_build="@glibcpp_CXX@ -static "
|
||||
CC_build="@glibcpp_CXX@"
|
||||
CXX=`echo $CC_build | sed 's/xgcc/g++/g'`
|
||||
echo ${CXX}
|
||||
;;
|
||||
|
|
|
|||
Loading…
Reference in New Issue