diff options
author | Peter Soetens <peter.soetens@mech.kuleuven.ac.be> | 2003-02-06 09:10:47 +0100 |
---|---|---|
committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2003-02-06 08:10:47 +0000 |
commit | 6eeabb09a66d8c47f387da7882f86780da50cdd8 (patch) | |
tree | 69d5137cfb16e8568f123a2a6adabb45ef5ab7de /libstdc++-v3 | |
parent | e61c8e230ac099c617f5daf275ab7c020935237c (diff) | |
download | gcc-6eeabb09a66d8c47f387da7882f86780da50cdd8.zip gcc-6eeabb09a66d8c47f387da7882f86780da50cdd8.tar.gz gcc-6eeabb09a66d8c47f387da7882f86780da50cdd8.tar.bz2 |
basic_file_libio.h: Fixups.
2003-02-06 Peter Soetens <peter.soetens@mech.kuleuven.ac.be>
* config/io/basic_file_libio.h: Fixups.
* config/io/c_io_libio.h: Same.
* libio/Makefile.am: Same.
* libio/Makefile.in: Regenerated.
From-SVN: r62475
Diffstat (limited to 'libstdc++-v3')
-rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
-rw-r--r-- | libstdc++-v3/Makefile.in | 2 | ||||
-rw-r--r-- | libstdc++-v3/config/io/basic_file_libio.h | 62 | ||||
-rw-r--r-- | libstdc++-v3/config/io/c_io_libio.h | 6 | ||||
-rw-r--r-- | libstdc++-v3/include/Makefile.in | 2 | ||||
-rw-r--r-- | libstdc++-v3/libio/Makefile.am | 2 | ||||
-rw-r--r-- | libstdc++-v3/libio/Makefile.in | 52 | ||||
-rw-r--r-- | libstdc++-v3/libmath/Makefile.in | 2 | ||||
-rw-r--r-- | libstdc++-v3/libsupc++/Makefile.in | 2 | ||||
-rw-r--r-- | libstdc++-v3/po/Makefile.in | 2 | ||||
-rw-r--r-- | libstdc++-v3/src/Makefile.in | 82 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/Makefile.in | 2 |
12 files changed, 156 insertions, 67 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d6f6855..0dc7487 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2003-02-06 Peter Soetens <peter.soetens@mech.kuleuven.ac.be> + + * config/io/basic_file_libio.h: Fixups. + * config/io/c_io_libio.h: Same. + * libio/Makefile.am: Same. + * libio/Makefile.in: Regenerated. + 2003-02-06 Benjamin Kosnik <bkoz@redhat.com> * testsuite/22_locale/codecvt/encoding/wchar_t/1.cc (test01): diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 698a1f1..21db5c9 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation diff --git a/libstdc++-v3/config/io/basic_file_libio.h b/libstdc++-v3/config/io/basic_file_libio.h index 57d83c4..959ecf9 100644 --- a/libstdc++-v3/config/io/basic_file_libio.h +++ b/libstdc++-v3/config/io/basic_file_libio.h @@ -1,6 +1,6 @@ // Wrapper of C-language FILE struct -*- C++ -*- -// Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2001, 2002, 2003 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 @@ -54,7 +54,7 @@ namespace std // and detailed description of the whole object-layout, // vtable-swapping, sordid history of this hack. template<typename _CharT> - struct __basic_file_base: public __c_file_type + struct __basic_file_base: public __c_file { virtual ~__basic_file_base() { }; @@ -123,7 +123,7 @@ namespace std class __basic_file: public __basic_file_base<_CharT> { # ifdef _GLIBCPP_USE_WCHAR_T - __c_wfile_type _M_wfile; + __c_wfile _M_wfile; # endif public: @@ -140,11 +140,14 @@ namespace std // Used for opening the standard streams, cin, cout, cerr, clog, // and their wide-stream equivalents. Instead of calling open, it // just sets - // - for libio: __c_file_type->_fileno and the respective _flags bits + // - for libio: __c_file->_fileno and the respective _flags bits // - for stdio: _M_cfile = __file and some internal flags // and returns. __basic_file* - sys_open(__c_file_type* __file, ios_base::openmode __mode); + sys_open(__c_file* __file, ios_base::openmode __mode); + + __basic_file* + sys_open(int __fd, ios_base::openmode __mode, bool __del); _CharT sys_getc(); @@ -156,7 +159,7 @@ namespace std close(); bool - is_open(); + is_open() const; int fd(); @@ -180,26 +183,26 @@ namespace std virtual int pbackfail(int __c); - // A complex "write" function that sets all of __c_file_type's + // A complex "write" function that sets all of __c_file's // pointers and associated data members correctly and manages its // relation to the external byte sequence. virtual streamsize xsputn(const _CharT* __s, streamsize __n); - // A complex "read" function that sets all of __c_file_type's + // A complex "read" function that sets all of __c_file's // pointers and associated data members correctly and manages its // relation to the external byte sequence. virtual streamsize xsgetn(_CharT* __s, streamsize __n); - // A complex "seekoff" function that sets all of __c_file_type's + // A complex "seekoff" function that sets all of __c_file's // pointers and associated data members correctly and manages its // relation to the external byte sequence. virtual streamoff seekoff(streamoff __off, ios_base::seekdir __way, ios_base::openmode __mode = ios_base::in | ios_base::out); - // A complex "seekpos" function that sets all of __c_file_type's + // A complex "seekpos" function that sets all of __c_file's // pointers and associated data members correctly and manages its // relation to the external byte sequence. virtual streamoff @@ -217,19 +220,19 @@ namespace std // A simple read function for the external byte sequence, that // does no mucking around with or setting of the pointers or flags - // in __c_file_type. + // in __c_file. virtual streamsize sys_read(_CharT* __s, streamsize __n); // A simple write function for the external byte sequence, that // does no mucking around with or setting of the pointers or flags - // in __c_file_type. + // in __c_file. virtual streamsize sys_write(const _CharT* __s, streamsize __n); // A simple seek function for the external byte sequence, that // does no mucking around with or setting of the pointers or flags - // in __c_file_type. + // in __c_file. virtual streamoff sys_seek(streamoff __off, ios_base::seekdir __way); @@ -394,7 +397,7 @@ namespace std template<typename _CharT> __basic_file<_CharT>* - __basic_file<_CharT>::sys_open(__c_file_type* __f, + __basic_file<_CharT>::sys_open(__c_file* __f, ios_base::openmode __mode) { __basic_file* __ret = NULL; @@ -419,6 +422,33 @@ namespace std } template<typename _CharT> + __basic_file<_CharT>* + __basic_file<_CharT>::sys_open(int __fd, ios_base::openmode __mode, + bool __del) + { + __basic_file* __ret = NULL; + int __p_mode = 0; + int __rw_mode = 0; + char __c_mode[4]; + +#if 0 +#error copy from basic_file_stdio.h will make no sense + _M_open_mode(__mode, __p_mode, __rw_mode, __c_mode); + if (!this->is_open() && (_M_cfile = fdopen(__fd, __c_mode))) + { + // Iff __del is true, then close will fclose the fd. + _M_cfile_created = __del; + + if (__fd == 0) + setvbuf(_M_cfile, reinterpret_cast<char*>(NULL), _IONBF, 0); + + __ret = this; + } +#endif + return __ret; + } + + template<typename _CharT> __basic_file<_CharT>* __basic_file<_CharT>::open(const char* __name, ios_base::openmode __mode, int __prot) @@ -431,7 +461,7 @@ namespace std _M_open_mode(__mode, __p_mode, __rw_mode, __c_mode); if (!_IO_file_is_open(this)) { - __c_file_type* __f; + __c_file* __f; __f = _IO_file_open(this, __name, __p_mode, __prot, __rw_mode, 0); __ret = __f ? this: NULL; } @@ -440,7 +470,7 @@ namespace std template<typename _CharT> bool - __basic_file<_CharT>::is_open() { return _fileno >= 0; } + __basic_file<_CharT>::is_open() const { return _fileno >= 0; } template<typename _CharT> __basic_file<_CharT>* diff --git a/libstdc++-v3/config/io/c_io_libio.h b/libstdc++-v3/config/io/c_io_libio.h index acf6520..81c8731 100644 --- a/libstdc++-v3/config/io/c_io_libio.h +++ b/libstdc++-v3/config/io/c_io_libio.h @@ -1,6 +1,6 @@ // underlying io library -*- C++ -*- -// Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2001, 2002, 2003 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 @@ -55,8 +55,8 @@ namespace std #endif // from basic_file.h - typedef _IO_FILE __c_file_type; - typedef _IO_wide_data __c_wfile_type; + typedef _IO_FILE __c_file; + typedef _IO_wide_data __c_wfile; #ifdef _GLIBCPP_USE_WCHAR_T extern "C" _IO_codecvt __c_libio_codecvt; diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 501238a..3f56290 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation diff --git a/libstdc++-v3/libio/Makefile.am b/libstdc++-v3/libio/Makefile.am index e0496b2..903ca8d 100644 --- a/libstdc++-v3/libio/Makefile.am +++ b/libstdc++-v3/libio/Makefile.am @@ -45,7 +45,7 @@ libio_headers = \ if GLIBCPP_NEED_LIBIO LIBIO_SRCS = \ - filedoalloc.c genops.c fileops.c stdfiles.c c_codecvt.c \ + filedoalloc.c genops.c fileops.c stdfiles.c \ iofclose.c iofopen.c else LIBIO_SRCS = diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index b212bf9..4dd5b80 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -161,7 +161,7 @@ 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@ filedoalloc.c genops.c fileops.c stdfiles.c \ @GLIBCPP_NEED_LIBIO_TRUE@ iofclose.c iofopen.c @GLIBCPP_NEED_LIBIO_FALSE@LIBIO_SRCS = @GLIBCPP_NEED_WLIBIO_TRUE@LIBIO_WSRCS = @GLIBCPP_NEED_WLIBIO_TRUE@\ @@ -184,31 +184,29 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libio_la_LDFLAGS = libio_la_LIBADD = -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@libio_la_OBJECTS = \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@filedoalloc.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@genops.lo fileops.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@stdfiles.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@c_codecvt.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@iofclose.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@iofopen.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@wfiledoalloc.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@wfileops.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@wgenops.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_TRUE@iofwide.lo -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_FALSE@libio_la_OBJECTS = \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_FALSE@wfiledoalloc.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_FALSE@wfileops.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_FALSE@wgenops.lo \ -@GLIBCPP_NEED_WLIBIO_TRUE@@GLIBCPP_NEED_LIBIO_FALSE@iofwide.lo -@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@libio_la_OBJECTS = \ -@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@filedoalloc.lo \ -@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@genops.lo \ -@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@fileops.lo \ -@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@stdfiles.lo \ -@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@c_codecvt.lo \ -@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@iofclose.lo \ -@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_TRUE@iofopen.lo -@GLIBCPP_NEED_WLIBIO_FALSE@@GLIBCPP_NEED_LIBIO_FALSE@libio_la_OBJECTS = +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_FALSE@libio_la_OBJECTS = \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_FALSE@filedoalloc.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_FALSE@genops.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_FALSE@fileops.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_FALSE@stdfiles.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_FALSE@iofclose.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_FALSE@iofopen.lo +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_TRUE@libio_la_OBJECTS = \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_TRUE@filedoalloc.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_TRUE@genops.lo fileops.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_TRUE@stdfiles.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_TRUE@iofclose.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_TRUE@iofopen.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_TRUE@wfiledoalloc.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_TRUE@wfileops.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_TRUE@wgenops.lo \ +@GLIBCPP_NEED_LIBIO_TRUE@@GLIBCPP_NEED_WLIBIO_TRUE@iofwide.lo +@GLIBCPP_NEED_LIBIO_FALSE@@GLIBCPP_NEED_WLIBIO_TRUE@libio_la_OBJECTS = \ +@GLIBCPP_NEED_LIBIO_FALSE@@GLIBCPP_NEED_WLIBIO_TRUE@wfiledoalloc.lo \ +@GLIBCPP_NEED_LIBIO_FALSE@@GLIBCPP_NEED_WLIBIO_TRUE@wfileops.lo \ +@GLIBCPP_NEED_LIBIO_FALSE@@GLIBCPP_NEED_WLIBIO_TRUE@wgenops.lo \ +@GLIBCPP_NEED_LIBIO_FALSE@@GLIBCPP_NEED_WLIBIO_TRUE@iofwide.lo +@GLIBCPP_NEED_LIBIO_FALSE@@GLIBCPP_NEED_WLIBIO_FALSE@libio_la_OBJECTS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in index 07984d6..658627d 100644 --- a/libstdc++-v3/libmath/Makefile.in +++ b/libstdc++-v3/libmath/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 9c61a2a..0f02a98 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in index 1bf5304..a97c28b 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index a985326..168c553 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -146,7 +146,7 @@ glibcpp_builddir = @glibcpp_builddir@ toolexecdir = @glibcpp_toolexecdir@ toolexeclibdir = @glibcpp_toolexeclibdir@ toolexeclib_LTLIBRARIES = libstdc++.la -@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_arg = -Wl,--version-script=libstdc++-symbol.ver +@GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@version_arg = @GLIBCPP_BUILD_VERSIONED_SHLIB_TRUE@-Wl,--version-script=libstdc++-symbol.ver @GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE@version_arg = # Compile flags that should be constant throughout the build, both for @@ -155,11 +155,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 -CONFIG_CXXFLAGS = @SECTION_FLAGS@ @EXTRA_CXX_FLAGS@ +CONFIG_CXXFLAGS = \ + @SECTION_FLAGS@ @EXTRA_CXX_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 @@ -169,33 +171,78 @@ 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) # Source files linked in via configuration/make substitution for a # particular target. -target_sources = codecvt_members.cc collate_members.cc ctype_members.cc messages_members.cc monetary_members.cc numeric_members.cc time_members.cc +target_sources = \ + codecvt_members.cc \ + collate_members.cc \ + ctype_members.cc \ + messages_members.cc \ + monetary_members.cc \ + numeric_members.cc \ + time_members.cc # Source files linked in via configuration/make substitution for a # particular target, but with ad hoc naming rules. -target_sources_extra = basic_file.cc c++locale.cc +target_sources_extra = \ + basic_file.cc \ + c++locale.cc # Sources present in the src directory. -sources = codecvt.cc complex_io.cc concept-inst.cc ctype.cc ext-inst.cc fstream.cc fstream-inst.cc functexcept.cc globals.cc io-inst.cc ios.cc istream-inst.cc limits.cc locale.cc locale-inst.cc localename.cc misc-inst.cc ostream-inst.cc sstream-inst.cc stdexcept.cc stl-inst.cc streambuf-inst.cc string-inst.cc strstream.cc valarray-inst.cc wstring-inst.cc ${target_sources} ${target_sources_extra} +sources = \ + codecvt.cc \ + complex_io.cc \ + concept-inst.cc \ + ctype.cc \ + ext-inst.cc \ + fstream.cc \ + fstream-inst.cc \ + functexcept.cc \ + globals.cc \ + io-inst.cc \ + ios.cc \ + istream-inst.cc \ + limits.cc \ + locale.cc \ + locale-inst.cc \ + localename.cc \ + misc-inst.cc \ + ostream-inst.cc \ + sstream-inst.cc \ + stdexcept.cc \ + stl-inst.cc \ + streambuf-inst.cc \ + string-inst.cc \ + strstream.cc \ + valarray-inst.cc \ + wstring-inst.cc \ + ${target_sources} \ + ${target_sources_extra} VPATH = $(top_srcdir)/src:$(top_srcdir) libstdc___la_SOURCES = $(sources) -libstdc___la_LIBADD = $(top_builddir)/libmath/libmath.la @libio_la@ $(top_builddir)/libsupc++/libsupc++convenience.la +libstdc___la_LIBADD = \ + $(top_builddir)/libmath/libmath.la @libio_la@ \ + $(top_builddir)/libsupc++/libsupc++convenience.la libstdc___la_DEPENDENCIES = libstdc++-symbol.ver $(libstdc___la_LIBADD) -libstdc___la_LDFLAGS = -version-info @libtool_VERSION@ ${version_arg} -lm @LIBUNWIND_FLAG@ +libstdc___la_LDFLAGS = \ + -version-info @libtool_VERSION@ ${version_arg} \ + -lm @LIBUNWIND_FLAG@ # Use special rules for the deprecated source files so that they find @@ -207,7 +254,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. -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 @@ -228,7 +280,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 @@ -237,7 +290,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 $@ debugdir = debug @@ -267,7 +321,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) @@ -379,7 +433,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index b30b4bd..21e416b 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation |