From: Benjamin Kosnik Date: Fri, 6 Apr 2001 06:08:17 +0000 (+0000) Subject: Warn when using backward headers. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=baac9fce7def6777455752eb3ebb94570fd254e4;p=gcc.git Warn when using backward headers. 2001-04-05 Benjamin Kosnik Warn when using backward headers. * include/backward/algo.h: Include warning file. * include/backward/vector.h: Same. * include/backward/tree.h: Same. * include/backward/tempbuf.h: Same. * include/backward/strstream: Same. * include/backward/streambuf.h: Same. * include/backward/stream.h: Same. * include/backward/stack.h: Same. * include/backward/slist.h: Same. * include/backward/set.h: Same. * include/backward/rope.h: * include/backward/queue.h: Same. * include/backward/pair.h: Same. * include/backward/ostream.h: Same. * include/backward/new.h: Same. * include/backward/multiset.h: Same. * include/backward/multimap.h: Same. * include/backward/map.h: Same. * include/backward/list.h: Same. * include/backward/iterator.h: Same. * include/backward/istream.h: Same. * include/backward/iostream.h: * include/backward/iomanip.h: * include/backward/heap.h: Same. * include/backward/hashtable.h: * include/backward/hash_set.h: * include/backward/hash_map.h: * include/backward/function.h: * include/backward/fstream.h: * include/backward/deque.h: * include/backward/defalloc.h: Same. * include/backward/complex.h: Same. * include/backward/bvector.h: * include/backward/alloc.h: * include/backward/algobase.h: Same. * include/backward/backward_warning.h: New file. * src/Makefile.am (backward_headers): Add backward_warning.h * src/Makefile.in: Regenerate. 2001-04-05 Benjamin Kosnik * src/Makefile.am (myinstalldirs): Make sure backward directory is created. (myinstallheaders): Install backward headers in backward directory. * src/Makefile.in: Regenerate. From-SVN: r41139 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f0509c2e64e..554fbeeeae4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,53 @@ +2001-04-05 Benjamin Kosnik + + Warn when using backward headers. + * include/backward/algo.h: Include warning file. + * include/backward/vector.h: Same. + * include/backward/tree.h: Same. + * include/backward/tempbuf.h: Same. + * include/backward/strstream: Same. + * include/backward/streambuf.h: Same. + * include/backward/stream.h: Same. + * include/backward/stack.h: Same. + * include/backward/slist.h: Same. + * include/backward/set.h: Same. + * include/backward/rope.h: + * include/backward/queue.h: Same. + * include/backward/pair.h: Same. + * include/backward/ostream.h: Same. + * include/backward/new.h: Same. + * include/backward/multiset.h: Same. + * include/backward/multimap.h: Same. + * include/backward/map.h: Same. + * include/backward/list.h: Same. + * include/backward/iterator.h: Same. + * include/backward/istream.h: Same. + * include/backward/iostream.h: + * include/backward/iomanip.h: + * include/backward/heap.h: Same. + * include/backward/hashtable.h: + * include/backward/hash_set.h: + * include/backward/hash_map.h: + * include/backward/function.h: + * include/backward/fstream.h: + * include/backward/deque.h: + * include/backward/defalloc.h: Same. + * include/backward/complex.h: Same. + * include/backward/bvector.h: + * include/backward/alloc.h: + * include/backward/algobase.h: Same. + + * include/backward/backward_warning.h: New file. + * src/Makefile.am (backward_headers): Add backward_warning.h + * src/Makefile.in: Regenerate. + +2001-04-05 Benjamin Kosnik + + * src/Makefile.am (myinstalldirs): Make sure backward directory is + created. + (myinstallheaders): Install backward headers in backward directory. + * src/Makefile.in: Regenerate. + 2001-04-05 Benjamin Kosnik Prepare for libstdc++-2.92. diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 301025bcf5d..6fb1b8f22cc 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -135,48 +135,7 @@ 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)" \ - "EXPECT=$(EXPECT)" \ - "RUNTEST=$(RUNTEST)" \ - "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ - "exec_prefix=$(exec_prefix)" \ - "infodir=$(infodir)" \ - "libdir=$(libdir)" \ - "includedir=$(includedir)" \ - "prefix=$(prefix)" \ - "tooldir=$(tooldir)" \ - "AR=$(AR)" \ - "AS=$(AS)" \ - "CC=$(CC)" \ - "CXX=$(CXX)" \ - "LD=$(LD)" \ - "LIBCFLAGS=$(LIBCFLAGS)" \ - "PICFLAG=$(PICFLAG)" \ - "RANLIB=$(RANLIB)" \ - "NM=$(NM)" \ - "NM_FOR_BUILD=$(NM_FOR_BUILD)" \ - "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ - "DESTDIR=$(DESTDIR)" \ - "WERROR=$(WERROR)" +AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CC_FOR_TARGET=$(CC_FOR_TARGET)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "EXPECT=$(EXPECT)" "RUNTEST=$(RUNTEST)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "includedir=$(includedir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC)" "CXX=$(CXX)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "NM=$(NM)" "NM_FOR_BUILD=$(NM_FOR_BUILD)" "NM_FOR_TARGET=$(NM_FOR_TARGET)" "DESTDIR=$(DESTDIR)" "WERROR=$(WERROR)" ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 CONFIG_HEADER = config.h diff --git a/libstdc++-v3/include/backward/algo.h b/libstdc++-v3/include/backward/algo.h index f580dcf22dc..20a2dd2d380 100644 --- a/libstdc++-v3/include/backward/algo.h +++ b/libstdc++-v3/include/backward/algo.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_ALGO_H #define _CPP_BACKWARD_ALGO_H 1 +#include "backward_warning.h" #include "algobase.h" #include "tempbuf.h" #include "iterator.h" diff --git a/libstdc++-v3/include/backward/algobase.h b/libstdc++-v3/include/backward/algobase.h index b9189559e3b..f9adcc036ae 100644 --- a/libstdc++-v3/include/backward/algobase.h +++ b/libstdc++-v3/include/backward/algobase.h @@ -26,6 +26,7 @@ #ifndef _CPP_BACKWARD_ALGOBASE_H #define _CPP_BACKWARD_ALGOBASE_H 1 +#include "backward_warning.h" #include "pair.h" #include "iterator.h" #include diff --git a/libstdc++-v3/include/backward/alloc.h b/libstdc++-v3/include/backward/alloc.h index 3997d14ab15..54a6fb17a40 100644 --- a/libstdc++-v3/include/backward/alloc.h +++ b/libstdc++-v3/include/backward/alloc.h @@ -14,6 +14,7 @@ #ifndef _CPP_BACKWARD_ALLOC_H #define _CPP_BACKWARD_ALLOC_H 1 +#include "backward_warning.h" #include #include diff --git a/libstdc++-v3/include/backward/backward_warning.h b/libstdc++-v3/include/backward/backward_warning.h new file mode 100644 index 00000000000..973dee00314 --- /dev/null +++ b/libstdc++-v3/include/backward/backward_warning.h @@ -0,0 +1,38 @@ +// 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. + +#ifndef _CPP_BACKWARD_BACKWARD_WARNING_H +#define _CPP_BACKWARD_BACKWARD_WARNING_H 1 + +#ifdef __DEPRECATED +# warning "This file includes at least one deprecated or antiquated header." +# warning "Please use the file instead of file for "C++" includes" +# warning "and use the file instead of file for "C" includes." +# warning "To disable this warning use -Wno-deprecated." +#endif + +#endif diff --git a/libstdc++-v3/include/backward/bvector.h b/libstdc++-v3/include/backward/bvector.h index 48a713ff396..8a1ab0d393d 100644 --- a/libstdc++-v3/include/backward/bvector.h +++ b/libstdc++-v3/include/backward/bvector.h @@ -28,6 +28,7 @@ #define __SGI_STL_BVECTOR_H +#include "backward_warning.h" #include using std::bit_vector; diff --git a/libstdc++-v3/include/backward/complex.h b/libstdc++-v3/include/backward/complex.h index 055eef9af11..c7e1d1c1bec 100644 --- a/libstdc++-v3/include/backward/complex.h +++ b/libstdc++-v3/include/backward/complex.h @@ -28,6 +28,7 @@ #ifndef _CPP_BACKWARD_COMPLEX_H #define _CPP_BACKWARD_COMPLEX_H 1 +#include "backward_warning.h" #include using std::complex; diff --git a/libstdc++-v3/include/backward/defalloc.h b/libstdc++-v3/include/backward/defalloc.h index 8edee690bc6..5f4428f9e08 100644 --- a/libstdc++-v3/include/backward/defalloc.h +++ b/libstdc++-v3/include/backward/defalloc.h @@ -26,6 +26,7 @@ #ifndef _CPP_BACKWARD_DEFALLOC_H #define _CPP_BACKWARD_DEFALLOC_H 1 +#include "backward_warning.h" #include "new.h" #include #include diff --git a/libstdc++-v3/include/backward/deque.h b/libstdc++-v3/include/backward/deque.h index 65d85bfef5c..81284518e50 100644 --- a/libstdc++-v3/include/backward/deque.h +++ b/libstdc++-v3/include/backward/deque.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_DEQUE_H #define _CPP_BACKWARD_DEQUE_H 1 +#include "backward_warning.h" #include "algobase.h" #include "alloc.h" #include diff --git a/libstdc++-v3/include/backward/fstream.h b/libstdc++-v3/include/backward/fstream.h index 6252d5d0969..4f03e4c6c84 100644 --- a/libstdc++-v3/include/backward/fstream.h +++ b/libstdc++-v3/include/backward/fstream.h @@ -1,4 +1,4 @@ -// Copyright (C) 2000 Free Software Foundation, Inc. +// Copyright (C) 2000, 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 @@ -28,6 +28,7 @@ #ifndef _CPP_BACKWARD_FSTREAM_H #define _CPP_BACKWARD_FSTREAM_H 1 +#include "backward_warning.h" #include using std::filebuf; diff --git a/libstdc++-v3/include/backward/function.h b/libstdc++-v3/include/backward/function.h index 747135eac61..a49c36ba1cd 100644 --- a/libstdc++-v3/include/backward/function.h +++ b/libstdc++-v3/include/backward/function.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_FUNCTION_H #define _CPP_BACKWARD_FUNCTION_H 1 +#include "backward_warning.h" #include #include #include diff --git a/libstdc++-v3/include/backward/hash_map.h b/libstdc++-v3/include/backward/hash_map.h index fd8d823cb00..b5d0da2d53d 100644 --- a/libstdc++-v3/include/backward/hash_map.h +++ b/libstdc++-v3/include/backward/hash_map.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_HASH_MAP_H #define _CPP_BACKWARD_HASH_MAP_H 1 +#include "backward_warning.h" #include "algobase.h" #include diff --git a/libstdc++-v3/include/backward/hash_set.h b/libstdc++-v3/include/backward/hash_set.h index 9458910a5f9..b09ba41d066 100644 --- a/libstdc++-v3/include/backward/hash_set.h +++ b/libstdc++-v3/include/backward/hash_set.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_HASH_SET_H #define _CPP_BACKWARD_HASH_SET_H 1 +#include "backward_warning.h" #include "algobase.h" #include diff --git a/libstdc++-v3/include/backward/hashtable.h b/libstdc++-v3/include/backward/hashtable.h index e2c5160d673..d5d138efa5e 100644 --- a/libstdc++-v3/include/backward/hashtable.h +++ b/libstdc++-v3/include/backward/hashtable.h @@ -31,6 +31,7 @@ #ifndef _CPP_BACKWARD_HASHTABLE_H #define _CPP_BACKWARD_HASHTABLE_H 1 +#include "backward_warning.h" #include #include "algo.h" #include "alloc.h" diff --git a/libstdc++-v3/include/backward/heap.h b/libstdc++-v3/include/backward/heap.h index 8c73b3d1c26..eb0161b3ec0 100644 --- a/libstdc++-v3/include/backward/heap.h +++ b/libstdc++-v3/include/backward/heap.h @@ -26,6 +26,7 @@ #ifndef _CPP_BACKWARD_HEAP_H #define _CPP_BACKWARD_HEAP_H 1 +#include "backward_warning.h" #include #include diff --git a/libstdc++-v3/include/backward/iomanip.h b/libstdc++-v3/include/backward/iomanip.h index 10cd3ba9fe0..dad183edde1 100644 --- a/libstdc++-v3/include/backward/iomanip.h +++ b/libstdc++-v3/include/backward/iomanip.h @@ -28,6 +28,7 @@ #ifndef _CPP_BACKWARD_IOMANIP_H #define _CPP_BACKWARD_IOMANIP_H 1 +#include "backward_warning.h" #include "iostream.h" #include diff --git a/libstdc++-v3/include/backward/iostream.h b/libstdc++-v3/include/backward/iostream.h index 81877d8b169..0d258af1434 100644 --- a/libstdc++-v3/include/backward/iostream.h +++ b/libstdc++-v3/include/backward/iostream.h @@ -28,6 +28,7 @@ #ifndef _CPP_BACKWARD_IOSTREAM_H #define _CPP_BACKWARD_IOSTREAM_H 1 +#include "backward_warning.h" #include using std::iostream; diff --git a/libstdc++-v3/include/backward/istream.h b/libstdc++-v3/include/backward/istream.h index 45344796d70..059e7742e2f 100644 --- a/libstdc++-v3/include/backward/istream.h +++ b/libstdc++-v3/include/backward/istream.h @@ -28,6 +28,7 @@ #ifndef _CPP_BACKWARD_ISTREAM_H #define _CPP_BACKWARD_ISTREAM_H 1 +#include "backward_warning.h" #include "iostream.h" #endif diff --git a/libstdc++-v3/include/backward/iterator.h b/libstdc++-v3/include/backward/iterator.h index d285160ca46..eea2c01c960 100644 --- a/libstdc++-v3/include/backward/iterator.h +++ b/libstdc++-v3/include/backward/iterator.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_ITERATOR_H #define _CPP_BACKWARD_ITERATOR_H 1 +#include "backward_warning.h" #include "function.h" #include #include "iostream.h" diff --git a/libstdc++-v3/include/backward/list.h b/libstdc++-v3/include/backward/list.h index 5870ee0ed7f..27d3cd3c0f5 100644 --- a/libstdc++-v3/include/backward/list.h +++ b/libstdc++-v3/include/backward/list.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_LIST_H #define _CPP_BACKWARD_LIST_H 1 +#include "backward_warning.h" #include "algobase.h" #include "alloc.h" #include diff --git a/libstdc++-v3/include/backward/map.h b/libstdc++-v3/include/backward/map.h index e9058c18220..911f59e51e4 100644 --- a/libstdc++-v3/include/backward/map.h +++ b/libstdc++-v3/include/backward/map.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_MAP_H #define _CPP_BACKWARD_MAP_H 1 +#include "backward_warning.h" #include "tree.h" #include diff --git a/libstdc++-v3/include/backward/multimap.h b/libstdc++-v3/include/backward/multimap.h index 04db0067497..1ecbb8152c4 100644 --- a/libstdc++-v3/include/backward/multimap.h +++ b/libstdc++-v3/include/backward/multimap.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_MULTIMAP_H #define _CPP_BACKWARD_MULTIMAP_H 1 +#include "backward_warning.h" #include "tree.h" #include diff --git a/libstdc++-v3/include/backward/multiset.h b/libstdc++-v3/include/backward/multiset.h index d78e6f8059b..19a2f4cb0a0 100644 --- a/libstdc++-v3/include/backward/multiset.h +++ b/libstdc++-v3/include/backward/multiset.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_MULTISET_H #define _CPP_BACKWARD_MULTISET_H 1 +#include "backward_warning.h" #include "tree.h" #include diff --git a/libstdc++-v3/include/backward/new.h b/libstdc++-v3/include/backward/new.h index e888126cf77..8e4c5c93997 100644 --- a/libstdc++-v3/include/backward/new.h +++ b/libstdc++-v3/include/backward/new.h @@ -30,6 +30,7 @@ #ifndef _CPP_BACKWARD_NEW_H #define _CPP_BACKWARD_NEW_H 1 +#include "backward_warning.h" #include using std::bad_alloc; diff --git a/libstdc++-v3/include/backward/ostream.h b/libstdc++-v3/include/backward/ostream.h index 53a983c3d88..4c74756192e 100644 --- a/libstdc++-v3/include/backward/ostream.h +++ b/libstdc++-v3/include/backward/ostream.h @@ -28,6 +28,7 @@ #ifndef _CPP_BACKWARD_OSTREAM_H #define _CPP_BACKWARD_OSTREAM_H 1 +#include "backward_warning.h" #include "iostream.h" #endif diff --git a/libstdc++-v3/include/backward/pair.h b/libstdc++-v3/include/backward/pair.h index 0c699587349..b0ce3cc5a3a 100644 --- a/libstdc++-v3/include/backward/pair.h +++ b/libstdc++-v3/include/backward/pair.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_PAIR_H #define _CPP_BACKWARD_PAIR_H 1 +#include "backward_warning.h" #include #include diff --git a/libstdc++-v3/include/backward/queue.h b/libstdc++-v3/include/backward/queue.h index f6a4b1b509f..6eaf246a18b 100644 --- a/libstdc++-v3/include/backward/queue.h +++ b/libstdc++-v3/include/backward/queue.h @@ -28,6 +28,7 @@ #ifndef _CPP_BACKWARD_QUEUE_H #define _CPP_BACKWARD_QUEUE_H 1 +#include "backward_warning.h" #include using std::queue; diff --git a/libstdc++-v3/include/backward/rope.h b/libstdc++-v3/include/backward/rope.h index 6dafb1697a6..abbef9efd6f 100644 --- a/libstdc++-v3/include/backward/rope.h +++ b/libstdc++-v3/include/backward/rope.h @@ -14,6 +14,7 @@ #ifndef _CPP_BACKWARD_ROPE_H #define _CPP_BACKWARD_ROPE_H 1 +#include "backward_warning.h" #include "hashtable.h" #include diff --git a/libstdc++-v3/include/backward/set.h b/libstdc++-v3/include/backward/set.h index 7822bea10c2..68d3c4cb935 100644 --- a/libstdc++-v3/include/backward/set.h +++ b/libstdc++-v3/include/backward/set.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_SET_H #define _CPP_BACKWARD_SET_H 1 +#include "backward_warning.h" #include "tree.h" #include diff --git a/libstdc++-v3/include/backward/slist.h b/libstdc++-v3/include/backward/slist.h index d979829328d..b643740ba75 100644 --- a/libstdc++-v3/include/backward/slist.h +++ b/libstdc++-v3/include/backward/slist.h @@ -15,6 +15,7 @@ #ifndef _CPP_BACKWARD_SLIST_H #define _CPP_BACKWARD_SLIST_H 1 +#include "backward_warning.h" #include using std::slist; diff --git a/libstdc++-v3/include/backward/stack.h b/libstdc++-v3/include/backward/stack.h index a9a800aabe0..48342365b51 100644 --- a/libstdc++-v3/include/backward/stack.h +++ b/libstdc++-v3/include/backward/stack.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_STACK_H #define _CPP_BACKWARD_STACK_H 1 +#include "backward_warning.h" #include "vector.h" #include "deque.h" #include "heap.h" diff --git a/libstdc++-v3/include/backward/stream.h b/libstdc++-v3/include/backward/stream.h index b22d686fb9e..21a851decd8 100644 --- a/libstdc++-v3/include/backward/stream.h +++ b/libstdc++-v3/include/backward/stream.h @@ -28,6 +28,7 @@ #ifndef _CPP_BACKWARD_STREAM_H #define _CPP_BACKWARD_STREAM_H 1 +#include "backward_warning.h" #include "iostream.h" #endif diff --git a/libstdc++-v3/include/backward/streambuf.h b/libstdc++-v3/include/backward/streambuf.h index a0df9f6440d..3965816dc45 100644 --- a/libstdc++-v3/include/backward/streambuf.h +++ b/libstdc++-v3/include/backward/streambuf.h @@ -28,6 +28,7 @@ #ifndef _CPP_BACKWARD_STREAMBUF_H #define _CPP_BACKWARD_STREAMBUF_H 1 +#include "backward_warning.h" #include using std::streambuf; diff --git a/libstdc++-v3/include/backward/strstream b/libstdc++-v3/include/backward/strstream index 51db6b5c91f..ed9a6b84418 100644 --- a/libstdc++-v3/include/backward/strstream +++ b/libstdc++-v3/include/backward/strstream @@ -19,10 +19,7 @@ #ifndef __SGI_STL_STRSTREAM #define __SGI_STL_STRSTREAM -#if defined(__sgi) && !defined(__GNUC__) && !defined(_STANDARD_C_PLUS_PLUS) -#error This header file requires the -LANG:std option -#endif - +#include "backward_warning.h" #include #include #include diff --git a/libstdc++-v3/include/backward/tempbuf.h b/libstdc++-v3/include/backward/tempbuf.h index 425adf10cb6..afb81bf64d4 100644 --- a/libstdc++-v3/include/backward/tempbuf.h +++ b/libstdc++-v3/include/backward/tempbuf.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_TEMPBUF_H #define _CPP_BACKWARD_TEMPBUF_H 1 +#include "backward_warning.h" #include "pair.h" #include "iterator.h" #include diff --git a/libstdc++-v3/include/backward/tree.h b/libstdc++-v3/include/backward/tree.h index 728544b62f0..9c732236f1a 100644 --- a/libstdc++-v3/include/backward/tree.h +++ b/libstdc++-v3/include/backward/tree.h @@ -16,6 +16,7 @@ #ifndef _CPP_EXT_TREE #define _CPP_EXT_TREE 1 +#include "backward_warning.h" #include using std::rb_tree; diff --git a/libstdc++-v3/include/backward/vector.h b/libstdc++-v3/include/backward/vector.h index fd6a4bd3f6e..cea51ebc195 100644 --- a/libstdc++-v3/include/backward/vector.h +++ b/libstdc++-v3/include/backward/vector.h @@ -27,6 +27,7 @@ #ifndef _CPP_BACKWARD_VECTOR_H #define _CPP_BACKWARD_VECTOR_H 1 +#include "backward_warning.h" #include "algobase.h" #include "alloc.h" #include diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index 897ea7ab9f4..07b420558db 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -111,7 +111,7 @@ xcompiling = @xcompiling@ 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 @@ -123,21 +123,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 diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in index 76191e97d3e..4aa5b2a1d8f 100644 --- a/libstdc++-v3/libmath/Makefile.in +++ b/libstdc++-v3/libmath/Makefile.in @@ -114,24 +114,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 $@ @@ -145,9 +139,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 = diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 226902c1c18..edeec53e47e 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -129,13 +129,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 @@ -147,38 +145,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) - - -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 +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 + + +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) @@ -194,12 +167,7 @@ LIBSUPCXX_CXXFLAGS = -prefer-pic # 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 @@ -223,9 +191,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 @@ -234,9 +200,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 = diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index d9dac6cc66c..055c7cd25db 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -21,7 +21,7 @@ ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## USA. -## $Id: Makefile.am,v 1.80 2001/03/31 20:15:43 bkoz Exp $ +## $Id: Makefile.am,v 1.81 2001/04/03 00:26:58 pme Exp $ AUTOMAKE_OPTIONS = 1.3 gnits MAINT_CHARSET = latin1 @@ -110,7 +110,7 @@ backward_headers = \ 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/strstream backward/backward_warning.h ext_headers = \ ext/rope ext/ropeimpl.h ext/stl_rope.h \ @@ -234,6 +234,7 @@ install-data-local: myinstalldirs myinstallheaders # NB: installation of shadow header directories is not attempted. myinstalldirs: if test -z "$(MULTISUBDIR)"; then \ + $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/backward; \ $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/bits; \ $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/ext; \ $(mkinstalldirs) $(DESTDIR)$(gxx_target_include_dir)/bits; \ @@ -248,19 +249,19 @@ c_incdir = @C_INCLUDE_DIR@ myinstallheaders: if test -z "$(MULTISUBDIR)"; then \ for i in $(base_headers); do \ - echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/"; \ + echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/";\ $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/; \ done; \ for i in $(ext_headers); do \ - echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/"; \ + echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/";\ $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/; \ done; \ for i in $(backward_headers); do \ - echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)"; \ - $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir); \ + echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/backward/";\ + $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/backward/; \ done; \ for i in $(c_base_headers); do \ - echo "$(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/"; \ + echo "$(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/";\ $(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/; \ done; \ for i in $(std_headers); do \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 04779bf74b4..21c3b02d0f5 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -121,13 +121,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 @@ -139,132 +137,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) - - -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 - - -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 - -@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 +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 + + +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 + + +c_base_headers = bits/std_cassert.h bits/std_cctype.h bits/std_cerrno.h bits/std_cfloat.h bits/std_climits.h bits/std_clocale.h bits/std_cmath.h bits/std_csetjmp.h bits/std_csignal.h bits/std_cstdarg.h bits/std_cstddef.h bits/std_cstdio.h bits/std_cstdlib.h bits/std_cstring.h bits/std_ctime.h bits/std_cwchar.h bits/std_cwctype.h bits/cmath.tcc + +@GLIBCPP_USE_CSHADOW_TRUE@c_shadow_headers = assert.h ctype.h errno.h float.h limits.h locale.h math.h setjmp.h signal.h stdarg.h stddef.h stdio.h stdlib.h string.h time.h wchar.h wctype.h fcntl.h libio.h iolibio.h libioP.h pthread.h iconv.h features.h langinfo.h bits/wrap_libio.h bits/wrap_iolibio.h bits/wrap_libioP.h bits/wrap_iconv.h bits/wrap_fcntl.h bits/wrap_pthread.h bits/wrap_features.h bits/wrap_langinfo.h sys/cdefs.h @GLIBCPP_USE_CSHADOW_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 - -@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 +std_headers = algorithm bitset complex deque fstream functional iomanip ios iosfwd iostream istream iterator limits list locale map memory numeric ostream queue set sstream stack stdexcept streambuf string utility valarray vector cassert cctype cerrno cfloat climits clocale ciso646 cmath csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime cwchar cwctype + +@GLIBCPP_NEED_LIBIO_TRUE@libio_headers = $(top_srcdir)/libio/_G_config.h $(top_srcdir)/libio/libio.h @GLIBCPP_NEED_LIBIO_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. @@ -287,12 +197,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 -D_GLIBCPP_NO_CONCEPT_CHECKS \ - $(LIBSUPCXX_CXXFLAGS) \ - $(WARN_CXXFLAGS) \ - $(OPTIMIZE_CXXFLAGS) \ - $(CONFIG_CXXFLAGS) +AM_CXXFLAGS = -fno-implicit-templates -D_GLIBCPP_NO_CONCEPT_CHECKS $(LIBSUPCXX_CXXFLAGS) $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) # libstdc++ libtool notes @@ -313,8 +218,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 @@ -323,8 +227,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 = @@ -602,6 +505,7 @@ install-data-local: myinstalldirs myinstallheaders # NB: installation of shadow header directories is not attempted. myinstalldirs: if test -z "$(MULTISUBDIR)"; then \ + $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/backward; \ $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/bits; \ $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/ext; \ $(mkinstalldirs) $(DESTDIR)$(gxx_target_include_dir)/bits; \ @@ -609,19 +513,19 @@ myinstalldirs: myinstallheaders: if test -z "$(MULTISUBDIR)"; then \ for i in $(base_headers); do \ - echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/"; \ + echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/";\ $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/bits/; \ done; \ for i in $(ext_headers); do \ - echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/"; \ + echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/";\ $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/ext/; \ done; \ for i in $(backward_headers); do \ - echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)"; \ - $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir); \ + echo "$(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/backward/";\ + $(INSTALL_DATA) $(src_incdir)/$$i $(gxx_include_dir)/backward/; \ done; \ for i in $(c_base_headers); do \ - echo "$(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/"; \ + echo "$(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/";\ $(INSTALL_DATA) $(c_incdir)/$$i $(gxx_include_dir)/bits/; \ done; \ for i in $(std_headers); do \ diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 0bd44d6da13..05570cefc12 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -118,14 +118,10 @@ AUTOMAKE_OPTIONS = foreign dejagnu no-installinfo DEJATOOL = libstdc++ -EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \ - echo $(top_builddir)/../expect/expect ; \ - else echo expect ; fi` +EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then echo $(top_builddir)/../expect/expect ; else echo expect ; fi` -RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \ - echo $(top_srcdir)/../dejagnu/runtest ; \ - else echo runtest; fi` +RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then echo $(top_srcdir)/../dejagnu/runtest ; else echo runtest; fi` mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h