std_cwchar.h: Guard.
2002-06-18 Benjamin Kosnik <bkoz@redhat.com> * include/c/std_cwchar.h: Guard. Add mbstate_t bits. * include/c/std_cwctype.h: Guard. * libsupc++/eh_alloc.cc: Tweak include order. * libsupc++/pure.cc: Use cstdio. * libsupc++/new_op.cc: Remove malloc forward declaration, as cstdlib brings it in. Use std::malloc. * src/Makefile.am (sources): Remove cmath.cc. * src/Makefile.in: Regenerate. * src/cmath.cc: Remove. From-SVN: r54782
This commit is contained in:
parent
ccf160f16c
commit
93b855862a
14 changed files with 1392 additions and 1301 deletions
|
@ -1,3 +1,17 @@
|
|||
2002-06-18 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* include/c/std_cwchar.h: Guard. Add mbstate_t bits.
|
||||
* include/c/std_cwctype.h: Guard.
|
||||
|
||||
* libsupc++/eh_alloc.cc: Tweak include order.
|
||||
* libsupc++/pure.cc: Use cstdio.
|
||||
* libsupc++/new_op.cc: Remove malloc forward declaration, as
|
||||
cstdlib brings it in. Use std::malloc.
|
||||
|
||||
* src/Makefile.am (sources): Remove cmath.cc.
|
||||
* src/Makefile.in: Regenerate.
|
||||
* src/cmath.cc: Remove.
|
||||
|
||||
2002-06-18 Phil Edwards <pme@gcc.gnu.org>
|
||||
|
||||
* configure.target: Force mips to use the generic cpu routines.
|
||||
|
|
|
@ -196,9 +196,9 @@ AM_MAKEFLAGS = \
|
|||
"DESTDIR=$(DESTDIR)" \
|
||||
"WERROR=$(WERROR)"
|
||||
|
||||
|
||||
# Subdir rules rely on $(FLAGS_TO_PASS)
|
||||
FLAGS_TO_PASS = $(AM_MAKEFLAGS)
|
||||
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
CONFIG_HEADER = config.h
|
||||
CONFIG_CLEAN_FILES = mkcheck testsuite_flags
|
||||
|
|
41
libstdc++-v3/aclocal.m4
vendored
41
libstdc++-v3/aclocal.m4
vendored
|
@ -1,6 +1,6 @@
|
|||
dnl aclocal.m4 generated automatically by aclocal 1.4
|
||||
dnl aclocal.m4 generated automatically by aclocal 1.4-p5
|
||||
|
||||
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
@ -2202,12 +2202,37 @@ AC_MSG_RESULT($enable_symvers)
|
|||
])
|
||||
|
||||
|
||||
# isc-posix.m4 serial 1 (gettext-0.10.40)
|
||||
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
||||
dnl This file is free software, distributed under the terms of the GNU
|
||||
dnl General Public License. As a special exception to the GNU General
|
||||
dnl Public License, this file may be distributed as part of a program
|
||||
dnl that contains a configuration script generated by Autoconf, under
|
||||
dnl the same distribution terms as the rest of that program.
|
||||
|
||||
# This test replaces the one in autoconf.
|
||||
# Currently this macro should have the same name as the autoconf macro
|
||||
# because gettext's gettext.m4 (distributed in the automake package)
|
||||
# still uses it. Otherwise, the use in gettext.m4 makes autoheader
|
||||
# give these diagnostics:
|
||||
# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
|
||||
# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
|
||||
|
||||
undefine([AC_ISC_POSIX])
|
||||
|
||||
AC_DEFUN([AC_ISC_POSIX],
|
||||
[
|
||||
dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
|
||||
AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
|
||||
]
|
||||
)
|
||||
|
||||
# Add --enable-maintainer-mode option to configure.
|
||||
# From Jim Meyering
|
||||
|
||||
# serial 1
|
||||
|
||||
AC_DEFUN(AM_MAINTAINER_MODE,
|
||||
AC_DEFUN([AM_MAINTAINER_MODE],
|
||||
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
||||
dnl maintainer-mode is disabled by default
|
||||
AC_ARG_ENABLE(maintainer-mode,
|
||||
|
@ -2224,7 +2249,7 @@ AC_DEFUN(AM_MAINTAINER_MODE,
|
|||
|
||||
# Define a conditional.
|
||||
|
||||
AC_DEFUN(AM_CONDITIONAL,
|
||||
AC_DEFUN([AM_CONDITIONAL],
|
||||
[AC_SUBST($1_TRUE)
|
||||
AC_SUBST($1_FALSE)
|
||||
if $2; then
|
||||
|
@ -2244,7 +2269,7 @@ fi])
|
|||
dnl Usage:
|
||||
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
|
||||
|
||||
AC_DEFUN(AM_INIT_AUTOMAKE,
|
||||
AC_DEFUN([AM_INIT_AUTOMAKE],
|
||||
[AC_REQUIRE([AC_PROG_INSTALL])
|
||||
PACKAGE=[$1]
|
||||
AC_SUBST(PACKAGE)
|
||||
|
@ -2272,7 +2297,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
|
|||
# Check to make sure that the build environment is sane.
|
||||
#
|
||||
|
||||
AC_DEFUN(AM_SANITY_CHECK,
|
||||
AC_DEFUN([AM_SANITY_CHECK],
|
||||
[AC_MSG_CHECKING([whether build environment is sane])
|
||||
# Just in case
|
||||
sleep 1
|
||||
|
@ -2313,7 +2338,7 @@ AC_MSG_RESULT(yes)])
|
|||
|
||||
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
|
||||
dnl The program must properly implement --version.
|
||||
AC_DEFUN(AM_MISSING_PROG,
|
||||
AC_DEFUN([AM_MISSING_PROG],
|
||||
[AC_MSG_CHECKING(for working $2)
|
||||
# Run test in a subshell; some versions of sh will print an error if
|
||||
# an executable is not found, even if stderr is redirected.
|
||||
|
@ -2329,7 +2354,7 @@ AC_SUBST($1)])
|
|||
|
||||
# Like AC_CONFIG_HEADER, but automatically create stamp file.
|
||||
|
||||
AC_DEFUN(AM_CONFIG_HEADER,
|
||||
AC_DEFUN([AM_CONFIG_HEADER],
|
||||
[AC_PREREQ([2.12])
|
||||
AC_CONFIG_HEADER([$1])
|
||||
dnl When config.status generates a header, we must update the stamp-h file.
|
||||
|
|
2466
libstdc++-v3/configure
vendored
2466
libstdc++-v3/configure
vendored
File diff suppressed because it is too large
Load diff
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
|
@ -36,6 +36,27 @@
|
|||
|
||||
#pragma GCC system_header
|
||||
|
||||
#include <bits/c++config.h>
|
||||
|
||||
#if _GLIBCPP_HAVE_WCHAR_H
|
||||
#include_next <wchar.h>
|
||||
#endif
|
||||
|
||||
// Need to do a bit of trickery here with mbstate_t as char_traits
|
||||
// assumes it is in wchar.h, regardless of wchar_t specializations.
|
||||
#ifndef _GLIBCPP_HAVE_MBSTATE_T
|
||||
extern "C"
|
||||
{
|
||||
typedef struct
|
||||
{
|
||||
int __fill[6];
|
||||
} mbstate_t;
|
||||
}
|
||||
#endif
|
||||
|
||||
namespace std
|
||||
{
|
||||
using ::mbstate_t;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -36,6 +36,10 @@
|
|||
|
||||
#pragma GCC system_header
|
||||
|
||||
#include <bits/c++config.h>
|
||||
|
||||
#if _GLIBCPP_HAVE_WCTYPE_H
|
||||
#include_next <wctype.h>
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -30,10 +30,10 @@
|
|||
// This is derived from the C++ ABI for IA-64. Where we diverge
|
||||
// for cross-architecture compatibility are noted with "@@@".
|
||||
|
||||
#include <exception>
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <climits>
|
||||
#include <exception>
|
||||
#include "unwind-cxx.h"
|
||||
#include "bits/c++config.h"
|
||||
#include "bits/gthr.h"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
// Support routines for the -*- C++ -*- dynamic memory management.
|
||||
// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation
|
||||
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation
|
||||
//
|
||||
// This file is part of GNU CC.
|
||||
//
|
||||
|
@ -33,8 +33,8 @@
|
|||
|
||||
using std::new_handler;
|
||||
using std::bad_alloc;
|
||||
using std::malloc;
|
||||
|
||||
extern "C" void *malloc (std::size_t);
|
||||
extern new_handler __new_handler;
|
||||
|
||||
void *
|
||||
|
|
|
@ -39,8 +39,8 @@
|
|||
/*# define write(fd, buf, n) __write((fd), (buf), (n))*/
|
||||
# endif
|
||||
#else
|
||||
# include <stdio.h>
|
||||
# define writestr(str) fputs(str, stderr)
|
||||
# include <cstdio>
|
||||
# define writestr(str) std::fputs(str, stderr)
|
||||
#endif
|
||||
|
||||
extern "C" void
|
||||
|
|
|
@ -64,7 +64,6 @@ sources = \
|
|||
basic_file.cc \
|
||||
bitset.cc \
|
||||
c++locale.cc \
|
||||
cmath.cc \
|
||||
codecvt.cc \
|
||||
collate.cc \
|
||||
complex_io.cc \
|
||||
|
|
|
@ -144,11 +144,13 @@ 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
|
||||
|
@ -158,22 +160,64 @@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@
|
|||
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
||||
TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@
|
||||
|
||||
INCLUDES = -nostdinc++ $(GLIBCPP_INCLUDES) $(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) $(TOPLEVEL_INCLUDES)
|
||||
INCLUDES = \
|
||||
-nostdinc++ \
|
||||
$(GLIBCPP_INCLUDES) \
|
||||
$(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \
|
||||
$(TOPLEVEL_INCLUDES)
|
||||
|
||||
|
||||
sources = basic_file.cc bitset.cc c++locale.cc cmath.cc codecvt.cc collate.cc complex_io.cc concept-inst.cc ctype.cc ext-inst.cc fstream-inst.cc functexcept.cc globals.cc io-inst.cc ios.cc istream-inst.cc limits.cc locale-inst.cc locale.cc localename.cc messages.cc misc-inst.cc monetary.cc numeric.cc ostream-inst.cc sstream-inst.cc stdexcept.cc stl-inst.cc streambuf-inst.cc string-inst.cc strstream.cc time.cc valarray-inst.cc vterminate.cc wstring-inst.cc
|
||||
sources = \
|
||||
basic_file.cc \
|
||||
bitset.cc \
|
||||
c++locale.cc \
|
||||
codecvt.cc \
|
||||
collate.cc \
|
||||
complex_io.cc \
|
||||
concept-inst.cc \
|
||||
ctype.cc \
|
||||
ext-inst.cc \
|
||||
fstream-inst.cc \
|
||||
functexcept.cc \
|
||||
globals.cc \
|
||||
io-inst.cc \
|
||||
ios.cc \
|
||||
istream-inst.cc \
|
||||
limits.cc \
|
||||
locale-inst.cc \
|
||||
locale.cc \
|
||||
localename.cc \
|
||||
messages.cc \
|
||||
misc-inst.cc \
|
||||
monetary.cc \
|
||||
numeric.cc \
|
||||
ostream-inst.cc \
|
||||
sstream-inst.cc \
|
||||
stdexcept.cc \
|
||||
stl-inst.cc \
|
||||
streambuf-inst.cc \
|
||||
string-inst.cc \
|
||||
strstream.cc \
|
||||
time.cc \
|
||||
valarray-inst.cc \
|
||||
vterminate.cc \
|
||||
wstring-inst.cc
|
||||
|
||||
|
||||
VPATH = $(top_srcdir)/src:$(top_srcdir)
|
||||
|
||||
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
|
||||
|
||||
@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_arg = -Wl,--version-script=linker.map
|
||||
@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_arg = @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@-Wl,--version-script=linker.map
|
||||
@GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@version_arg =
|
||||
|
||||
libstdc___la_LDFLAGS = -version-info @libtool_VERSION@ ${version_arg} -lm @LIBUNWIND_FLAG@
|
||||
libstdc___la_LDFLAGS = \
|
||||
-version-info @libtool_VERSION@ ${version_arg} \
|
||||
-lm @LIBUNWIND_FLAG@
|
||||
|
||||
|
||||
libstdc___la_DEPENDENCIES = $(libstdc___la_LIBADD) linker.map
|
||||
|
@ -187,7 +231,12 @@ GLIBCPP_INCLUDE_DIR = @glibcpp_builddir@/include
|
|||
# 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
|
||||
|
@ -208,7 +257,8 @@ AM_CXXFLAGS = -fno-implicit-templates $(LIBSUPCXX_CXXFLAGS) $(WARN_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
|
||||
|
@ -217,7 +267,8 @@ 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 =
|
||||
|
@ -228,9 +279,9 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
|
|||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
libstdc___la_OBJECTS = basic_file.lo bitset.lo c++locale.lo cmath.lo \
|
||||
codecvt.lo collate.lo complex_io.lo concept-inst.lo ctype.lo \
|
||||
ext-inst.lo fstream-inst.lo functexcept.lo globals.lo io-inst.lo ios.lo \
|
||||
libstdc___la_OBJECTS = basic_file.lo bitset.lo c++locale.lo codecvt.lo \
|
||||
collate.lo complex_io.lo concept-inst.lo ctype.lo ext-inst.lo \
|
||||
fstream-inst.lo functexcept.lo globals.lo io-inst.lo ios.lo \
|
||||
istream-inst.lo limits.lo locale-inst.lo locale.lo localename.lo \
|
||||
messages.lo misc-inst.lo monetary.lo numeric.lo ostream-inst.lo \
|
||||
sstream-inst.lo stdexcept.lo stl-inst.lo streambuf-inst.lo \
|
||||
|
@ -244,7 +295,7 @@ DIST_COMMON = Makefile.am Makefile.in
|
|||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
SOURCES = $(libstdc___la_SOURCES)
|
||||
OBJECTS = $(libstdc___la_OBJECTS)
|
||||
|
|
|
@ -1,47 +0,0 @@
|
|||
// Explicit instantiation file for -*- C++ -*- math library.
|
||||
|
||||
// Copyright (C) 2001 Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library 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, or (at your option)
|
||||
// any later version.
|
||||
|
||||
// This library 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 library; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
// USA.
|
||||
|
||||
// As a special exception, you may use this file as part of a free software
|
||||
// library without restriction. Specifically, if other files instantiate
|
||||
// templates or use macros or inline functions from this file, or you compile
|
||||
// this file and link it with other files to produce an executable, this
|
||||
// file does not by itself cause the resulting executable to be covered by
|
||||
// the GNU General Public License. This exception does not however
|
||||
// invalidate any other reasons why the executable file might be covered by
|
||||
// the GNU General Public License.
|
||||
|
||||
|
||||
// These are explicit instantiations of the behind-the-scenes internal
|
||||
// helper functions used in the math routines of libstdc++.
|
||||
|
||||
|
||||
#include <cmath>
|
||||
|
||||
namespace std
|
||||
{
|
||||
// This function is only declared/used in the cheaders=c_std case.
|
||||
template float
|
||||
__cmath_power<float>(float, unsigned int);
|
||||
template double
|
||||
__cmath_power<double>(double, unsigned int);
|
||||
template long double
|
||||
__cmath_power<long double>(long double, unsigned int);
|
||||
|
||||
} // namespace std
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
Loading…
Add table
Reference in a new issue