config:

	* gcc-version.m4: Delete.
fastjar:
	* Makefile.am (fastjar_TEXINFOS): Add gcc-vers.texi.
	(BASEVER, DEVPHASE): New variables.
	(POD2MAN): Adjust setting of --release option.
	(fastjar.1, grepjar.1, gcc-vers.texi): New rules.
	* Makefile.in: Regenerate.
	* configure.ac: Do not invoke TL_AC_GCC_VERSION.
	* aclocal.m4, configure: Regenerate.
gcc:
	* BASE-VER, DATESTAMP, DEV-PHASE: New files.
	* Makefile.in (gcc_version, gcc_version_trigger, ): Delete.
	(BASEVER, DEVPHASE, DATESTAMP, BASEVER_c, DEVPHASE_c, DATESTAMP_c)
	(BASEVER_s, DEVPHASE_s, DATESTAMP_s): New variables.
	(version): Define using $(BASEVER_c).
	(Makefile, config.status, build/gcov-iov.o): No longer depends on
	version.c.
	(version.o): Depend on version files; add custom generation command.
	(prefix.o): Define BASEVER on command line.
	(s-iov): Depend on version files; adjust command.
	(TEXI_CPP_FILES, TEX_IGCC_FILES, TEXI_GCCINT_FILES, TEXI_CPPINT_FILES):
	Add gcc-vers.texi.
	(gcc-vers.texi): New rule.
	(doc/%.info, doc/%.dvi): Add -I . to command line.
	(doc/gccinstall.dvi): Likewise.
	(PACKAGE): Delete.  All uses replaced with "gcc".
	* aclocal.m4: Do not include gcc-version.m4.
	* configure.ac: Do not invoke TL_AC_GCC_VERSION.
	Do not AC_SUBST nor AC_DEFINE PACKAGE or VERSION.
	Set is_release based on contents of DEV-PHASE.
	Set gcc_version based on contents of BASE-VER.
	Define WIN32_REGISTRY_KEY only if the user overrode the default.
	* config.in, configure: Regenerate.
	* gccbug.in: Determine version of GCC in use at runtime.
	* gcov-iov.c: Get version number and development phase from
	command line, not by including version.c.
	* intl.c: Replace all uses of PACKAGE with "gcc".
	* libada-mk.in: Delete unused "gcc_version" variable.
	* prefix.c: Default WIN32_REGISTRY_KEY to BASEVER.
	* version.c: (VERSUFFIX): New hook for redistributors; adjust
	commentary to match.
	(version_string): Put together from pieces.
	* config/alpha/x-vms: Do not use $(gcc_version).
	* config/i386/t-nwld: Likewise.
	* doc/include/gcc-common.texi: Include gcc-vers.texi for
	version-GCC and DEVELOPMENT.
gcc/ada:
	* Make-lang.in (doc/gnat_ugn_unw.info, doc/gnat_rm.info)
	(doc/gnat_ugn_unw.dvi, doc/gnat_rm.dvi): Add gcc-vers.texi
	to dependencies.
gcc/fortran:
	* Make-lang.in (GFORTRAN_TEXI): Add gcc-vers.texi.
gcc/java:
	* Make-lang.in (TEXI_JAVA_FILES): Add gcc-vers.texi.
gcc/treelang:
	* Make-lang.in (TEXI_TREELANG_FILES): Add gcc-vers.texi.
libstdc++-v3:
	* include/Makefile.am (c++config.h): Depend on DATESTAMP from gcc
	subdirectory.  Generate #define of __GLIBCXX__ from contents of
	that file.
	* include/Makefile.in: Regenerate.
	* include/bits/c++config: Do not define __GLIBCXX__.
maintainer-scripts:
	* README: Update.
	* gcc_release: Update gcc/DEV-PHASE if that file exists, instead
	of gcc/version.c.
	* update_version: Handle updating gcc/DATESTAMP.
	* update_web_docs: Generate gcc-vers.texi first.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96549 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 43 insertions, 32 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 20544556679..338228da8fa 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-15  Zack Weinberg  <zack@codesourcery.com>
+
+	* include/Makefile.am (c++config.h): Depend on DATESTAMP from gcc
+	subdirectory.  Generate #define of __GLIBCXX__ from contents of
+	that file.
+	* include/Makefile.in: Regenerate.
+	* include/bits/c++config: Do not define __GLIBCXX__.
+
 2005-03-15  Paolo Carlini  <pcarlini@suse.de>
 
 	PR libstdc++/20352
@@ -92,14 +100,14 @@
 	New test of reference_wrapper typedefs and base classes.
 	* testsuite/tr1/3_function_objects/result_of.cc: Trivial cleanup
 	(e-mail address).
-	
+
 2005-03-02  Douglas Gregor  <doug.gregor@gmail.com>
 
 	* include/tr1/function (result_of): New class template.
 	* include/tr1/functional/iterator.h: Implementation of TR1
 	result_of.
 	* testsuite/tr1/3_function_objects/result_of.cc: New test
-	
+
 2005-03-01  Vladimir Merzliakov  <wanderer@rsu.ru>
 
 	* testsuite/26_numerics/cmath/c99_classification_macros_c.cc: Tweak.
@@ -110,7 +118,7 @@
 	cons/auto_ptr_neg.cc: Correct line numbers.
 
 	* testsuite/testsuite_abi.cc: Add CXXABI_1.3.1.
-	
+
 2005-02-28  Jonathan Wakely  <redi@gcc.gnu.org>
 
 	* include/tr1/memory: Replace checked_deleter with (unchecked)
@@ -158,7 +166,7 @@
 	* acconfig.h: Same.
 	* configure: Regenerate.
 	* config.h.in: Same.
-	
+
 2005-02-24  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/tr1/functional (mem_fn): Avoid _T, badname on
@@ -170,7 +178,7 @@
 	(mem_fn): New function template.
 	Implementations of TR1 function and mem_fn facilities.
 	* include/tr1/functional_iterate.h: Implementations of TR1
-	function and mem_fn facilities. 
+	function and mem_fn facilities.
 	* testsuite/tr1/3_function_objects/function/1.cc: New
 	test of std::tr1::function.
 	* testsuite/tr1/3_function_objects/function/2.cc: New
@@ -190,8 +198,8 @@
 	* testsuite/tr1/3_function_objects/function/9.cc: New
 	test of std::tr1::function.
 	* testsuite/tr1/3_function_objects/mem_fn.cc: New test of
-	std::tr1::mem_fn. 
-	
+	std::tr1::mem_fn.
+
 2005-02-23  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/tr1/type_traits: Implement is_convertible.
@@ -207,7 +215,7 @@
 	is_function/is_function.cc: Add testcase.
 
 2005-02-22  Benjamin Kosnik  <bkoz@redhat.com>
-	
+
 	* scripts/check_performance: Tweaks.
 
 	* testsuite/27_io/basic_ostream/inserters_other/wchar_t/2.cc: Name
@@ -338,7 +346,7 @@
 	* testsuite/tr1/6_containers/unordered/find/map1.cc: New test.
 	* testsuite/tr1/6_containers/unordered/find/multimap1.cc: New test.
 	* testsuite/tr1/6_containers/unordered/find/multiset1.cc: New test.
-	
+
 2005-02-19  Hans-Peter Nilsson  <hp@axis.com>
 
 	PR libstdc++/20071
@@ -365,7 +373,7 @@
 	* testsuite/tr1/6_containers/unordered/insert/multimap_range.cc: New test.
 	* testsuite/tr1/6_containers/unordered/insert/multiset_range.cc: New test.
 	* testsuite/tr1/6_containers/unordered/insert/set_range.cc: New test.
-	
+
 2005-02-18  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	* testsuite/thread/pthread1.cc: Do not invoke pthread_setconcurrency
@@ -395,7 +403,7 @@
 	* testsuite/tr1/6_containers/unordered/instantiate/multimap.cc: New test.
 	* testsuite/tr1/6_containers/unordered/instantiate/multiset.cc: New test.
 	* testsuite/tr1/6_containers/unordered/instantiate/set.cc: New test.
-	
+
 2005-02-16  Paolo Carlini  <pcarlini@suse.de>
 
 	* testsuite/23_containers/set/modifiers/16728.cc:
@@ -410,7 +418,7 @@
 
 2005-02-15  Paolo Carlini  <pcarlini@suse.de>
 	    Jon Grimm  <jgrimm2@us.ibm.com>
-	
+
 	PR libstdc++/19955
 	* include/bits/locale_facets.h (ctype<char>::_M_narrow_init()):
 	Fix the logic setting _M_narrow_ok: first check whether the
@@ -493,7 +501,7 @@
 2005-01-31  Brad Spencer  <spencer@infointeractive.com>
 
 	* crossconfig.m4: Repair Solaris cross bits for strtold and strtof.
-	* configure: Regenerated.	
+	* configure: Regenerated.
 
 2005-01-31  Mark Mitchell  <mark@codesourcery.com>
 
@@ -589,7 +597,7 @@
 	is_abstract.cc: New.
 	* testsuite/tr1/4_metaprogramming/type_properties/is_abstract/
 	typedefs.cc: Likewise.
-	
+
 	* include/tr1/type_traits (is_function): Rewrite, use the conversion
 	F& -> F* instead, thus avoiding problems with abstract classes.
 	* testsuite/tr1/4_metaprogramming/primary_type_categories/
@@ -750,7 +758,7 @@
 
 	* testsuite/27_io/basic_ostream/endl/char/1.cc: Minor tweaks.
 	* testsuite/27_io/basic_ostream/ends/char/1.cc: Likewise.
-	* testsuite/27_io/basic_ostream/exceptions/char/9561.cc: Likewise. 
+	* testsuite/27_io/basic_ostream/exceptions/char/9561.cc: Likewise.
 	* testsuite/27_io/basic_ostream/flush/char/1.cc: Likewise.
 	* testsuite/27_io/basic_ostream/flush/char/2.cc: Likewise.
 	* testsuite/27_io/basic_ostream/flush/char/
@@ -793,7 +801,7 @@
 	of aligned.
 
 2005-01-23  Paolo Carlini  <pcarlini@suse.de>
-            Andreas Jaeger  <aj@suse.de>
+	    Andreas Jaeger  <aj@suse.de>
 
 	PR libstdc++/19343
 	* include/bits/functexcept.h: Mark the helpers as 'noreturn'.
@@ -818,7 +826,7 @@
 2005-01-20  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* testsuite/Makefile.am (check-compile): New.
-	* testsuite/Makefile.in: Regenerate.	
+	* testsuite/Makefile.in: Regenerate.
 	* scripts/check_compile_time: New.
 	* scripts/check_performance: Tweaks.
 
@@ -851,7 +859,7 @@
 	* testsuite/performance/20_util/allocator/insert.cc: Remove bogus
 	return, add return.
 	* testsuite/performance/20_util/allocator/map_thread.cc: Same.
-	
+
 2005-01-17  Paolo Carlini  <pcarlini@suse.de>
 
 	PR libstdc++/19433
@@ -860,10 +868,10 @@
 	Obtain amortized constant complexity if t is inserted right after
 	p - not before p - as per Table 69.
 	* testsuite/performance/23_containers/set_insert_from_sorted.cc: New.
-	
+
 	* testsuite/23_containers/multiset/insert/2.cc: New.
 	* testsuite/23_containers/set/insert/1.cc: Likewise.
-	
+
 	* testsuite/performance/23_containers/set_create_from_sorted.cc:
 	Simplify.
 
@@ -972,7 +980,7 @@
 	enc_traits to...
 	* config/locale/ieee_1003.1-2001/codecvt_specializations.h: Move...
 	* include/ext/codecvt_specializations.h: ...here. Remove
-	_GLIBCXX_USE___ENC_TRAITS. 
+	_GLIBCXX_USE___ENC_TRAITS.
 	(__enc_traits): To __encoding_state, put in __gnu_cxx namespace.
 	(enc_char_traits): To __encoding_char_traits, put in __gnu_cxx
 	namespace.
@@ -986,10 +994,10 @@
 	uglified data members of basic_filebuf, including _M_buf,
 	_M_buf_size, _M_mode, _M_pback_init.
 	* include/std/std_fstream.h: Same.
-	
+
 2005-01-05  Benjamin Kosnik  <bkoz@redhat.com>
 
-	* testsuite/testsuite_hooks.h: 
+	* testsuite/testsuite_hooks.h:
 	(copy_constructor::mark_call):  Use __throw_runtime_error.
 	(assignment_operator::mark_call): Same.
 	* testsuite/testsuite_hooks.cc (verify_demangle): Same.
@@ -1010,14 +1018,14 @@
 
 	* testsuite/27_io/basic_filebuf/open/char/9507.cc: Remove child
 	process.
-	
+
 2005-01-05  Paolo Carlini  <pcarlini@suse.de>
 
 	* src/istream.cc (basic_istream<char>::ignore(streamsize),
 	basic_istream<char>::ignore(streamsize, int_type),
 	basic_istream<wchar_t>::ignore(streamsize),
 	basic_istream<wchar_t>::ignore(streamsize, int_type)): At the end,
-	first check _M_gcount vs __n. 	
+	first check _M_gcount vs __n.
 	* include/bits/istream.tcc (ignore(streamsize), ignore(streamsize,
 	int_type)): Likewise.
 	* testsuite/27_io/basic_istream/ignore/char/4.cc: New.
@@ -1045,7 +1053,7 @@
 	* testsuite/27_io/objects/wchar_t/7.cc: Likewise.
 	* testsuite/27_io/objects/wchar_t/9661-1.cc: Likewise.
 
-	* configure.ac: Check for sys/ipc.h and sys/sem.h. 
+	* configure.ac: Check for sys/ipc.h and sys/sem.h.
 	* config.h.in: Regenerated.
 	* configure: Likewise.
 	* testsuite/testsuite_hooks.cc (_GLIBCXX_SYSV_SEM): Conditionally
@@ -1088,7 +1096,7 @@
 	basic_istream<char>::ignore(streamsize, int_type),
 	basic_istream<wchar_t>::ignore(streamsize),
 	basic_istream<wchar_t>::ignore(streamsize, int_type)): Avoid
-	_M_gcount overflows. 	
+	_M_gcount overflows.
 	* include/bits/istream.tcc (ignore(streamsize), ignore(streamsize,
 	int_type)): Likewise; use snextc in the main loop, consistently
 	with the specializations above.
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 2b260b2ac6d..84ed1bfdad0 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -521,8 +521,11 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
 # Host includes dynamic.
 ${host_builddir}/c++config.h: ${top_builddir}/config.h \
 				${glibcxx_srcdir}/include/bits/c++config \
-				stamp-${host_alias}
+				stamp-${host_alias} \
+				${toplevel_srcdir}/gcc/DATESTAMP
 	@cat ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
+	sed -e 's/^/#define __GLIBCXX__ /' \
+            < ${toplevel_srcdir}/gcc/DATESTAMP >> $@ ;\
 	sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
 	    -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \
 	    -e 's/VERSION/_GLIBCXX_VERSION/g' \
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 6fbb9433714..0476f465984 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -900,8 +900,11 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
 # Host includes dynamic.
 ${host_builddir}/c++config.h: ${top_builddir}/config.h \
 				${glibcxx_srcdir}/include/bits/c++config \
-				stamp-${host_alias}
+				stamp-${host_alias} \
+				${toplevel_srcdir}/gcc/DATESTAMP
 	@cat ${glibcxx_srcdir}/include/bits/c++config > $@ ;\
+	sed -e 's/^/#define __GLIBCXX__ /' \
+            < ${toplevel_srcdir}/gcc/DATESTAMP >> $@ ;\
 	sed -e 's/HAVE_/_GLIBCXX_HAVE_/g' \
 	    -e 's/PACKAGE/_GLIBCXX_PACKAGE/g' \
 	    -e 's/VERSION/_GLIBCXX_VERSION/g' \
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 872d78bb579..526ab8c7355 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -34,9 +34,6 @@
 // Pick up any OS-specific definitions.
 #include <bits/os_defines.h>
 
-// The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20050316
-
 // Allow use of "export template." This is currently not a feature
 // that g++ supports.
 // #define _GLIBCXX_EXPORT_TEMPLATE 1