Makefile.am: Add definition of AM_CXXFLAGS.

	* testsuite/Makefile.am: Add definition of AM_CXXFLAGS.
	Change definition of CXX to use $(shell) instead of backticks.
	* testsuite/Makefile.in: Regenerate.

From-SVN: r80693

3 files changed, 74 insertions, 66 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 67bff0f..f123374 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-14  Zack Weinberg  <zack@codesourcery.com>
+
+	* testsuite/Makefile.am: Add definition of AM_CXXFLAGS.
+	Change definition of CXX to use $(shell) instead of backticks.
+	* testsuite/Makefile.in: Regenerate.
+
 2004-04-12  Dhruv Matani  <dhruvbird@gmx.net>
 
 	* testsuite/performance/20_util/allocator/list_sort_search.cc:
@@ -103,7 +109,7 @@
 	enumerations from _Rope_RopeRep here.
 	* include/ext/ropeimpl.h: Same.
 	* src/ext-inst.cc (_S_min_len): Fix up definition.
-	
+
 	* config/locale/gnu/ctype_members.cc: Qualify base class members
 	with this.
 	* config/locale/generic/ctype_members.cc: Same.
@@ -111,11 +117,11 @@
 	* config/locale/generic/messages_members.h: Same.
 	* src/ctype.cc: Same.
 	* include/bits/codecvt.h: Same.
-	
+
 	* include/bits/boost_concept_check.h: Declare.
 	(__error_type_must_be_an_unsigned_integer_type): Remove this.
 	(__error_type_must_be_an_integer_type): Remove this.
-	(__error_type_must_be_a_signed_integer_type): Remove this.	
+	(__error_type_must_be_a_signed_integer_type): Remove this.
 
 	* config/io/basic_file_stdio.cc (__basic_file::sys_open): Remove cast.
 
@@ -124,8 +130,8 @@
 	(__cxa_allocate_exception): Same.
 	* libsupc++/eh_catch.cc (__cxa_begin_catch): Same.
 	* libsupc++/eh_globals.cc (__cxa_get_globals_fast): Same.
-	(__cxa_get_globals): Same.	
-	
+	(__cxa_get_globals): Same.
+
 	* libsupc++/del_op.cc: Add comment about freestanding.
 
 2004-04-05  Paolo Carlini  <pcarlini@suse.de>
@@ -244,9 +250,9 @@
 	* include/bits/stl_tree.h (_Rb_tree_impl): Add _Node_allocator
 	default argument in constructors.
 	(_Rb_tree::_M_empty_initialize): Remove.
-	
+
 2004-03-25  Benjamin Kosnik  <bkoz@redhat.com>
-	
+
 	* testsuite/23_containers/map/operators/1_neg.cc: Adjust line numbers.
 	* testsuite/23_containers/set/operators/1_neg.cc: Same.
 
@@ -322,7 +328,7 @@
 	* testsuite/23_containers/deque/cons/clear_allocator.cc: New.
 	* testsuite/23_containers/list/cons/clear_allocator.cc: New.
 	* testsuite/23_containers/vector/cons/clear_allocator.cc: New.
-	
+
 2004-03-24  Dhruv Matani  <dhruvbird@gmx.net>
 
 	* include/ext/malloc_allocator.h: Fixed the construct function to
@@ -332,7 +338,7 @@
 	* include/ext/debug_allocator.h: Added a check in the deallocate
 	function to check whether the user has passed a NULL pointer or
 	not.
-	
+
 2004-03-24  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* docs/html/20_util/allocator.html: Add bitmap_allocator links.
@@ -343,7 +349,7 @@
 	warning from IA64 assembler.
 
 2004-03-24  Dhruv Matani  <dhruvbird@gmx.net>
-	
+
 	* include/ext/bitmap_allocator.h: (_Bit_scan_forward) -> Made this
 	function call __builtin_ctz instead of the while loop.
 	(allocate) -> If condition has __builtin_expect.
@@ -357,7 +363,7 @@
 
 	* testsuite/performance/20_util/allocator/producer_consumer.cc:
 	Use linear algorithm for producer.
-	
+
 2004-03-24  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/ext/mt_allocator.h (__mt_alloc<>::allocate,
@@ -425,7 +431,7 @@
 	* testsuite/27_io/basic_istream/extractors_arithmetic/char/12.cc:
 	Likewise.
 	* testsuite/27_io/basic_istream/extractors_arithmetic/char/13.cc:
-	Likewise.	
+	Likewise.
 
 2004-03-20  Paolo Carlini  <pcarlini@suse.de>
 
@@ -489,18 +495,18 @@
 	* acinclude.m4 (GLIBCXX_ENABLE_ALLOCATOR): Default setting is
 	new_allocator for all hosts.
 	* configure: Regenerate.
-	
+
 2004-03-16  Paolo Carlini  <pcarlini@suse.de>
 
 	* testsuite/22_locale/num_put/put/char/4.cc: Fix for 64-bit pointers.
 	* testsuite/22_locale/num_put/put/wchar_t/4.cc: Likewise.
-	
+
 2004-03-15  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/locale_facets.tcc (money_get<>::_M_extract):
 	Adjust the logic underlying the parsing of symbol to deal
 	correctly with an optional sign component (i.e., when either
-	negative_sign or positive_sign is empty) 
+	negative_sign or positive_sign is empty)
 	* testsuite/22_locale/money_get/get/char/19.cc: New.
 	* testsuite/22_locale/money_get/get/wchar_t/19.cc: New.
 
@@ -521,7 +527,7 @@
 	* include/bits/allocator.h: Include c++allocator.h.
 	* acinclude.m4 (GLIBCXX_ENABLE_ALLOCATOR): New.
 	* aclocal.m4: Regenerate.
-	* configure.ac: Use GLIBCXX_ENABLE_ALLOCATOR. 
+	* configure.ac: Use GLIBCXX_ENABLE_ALLOCATOR.
 	* configure: Regenerate.
 	* include/Makefile.am (host_headers_extra): Add c++allocator.h.
 	* include/Makefile.in: Regenerate.
@@ -543,7 +549,7 @@
 
 	* testsuite/20_util/allocator/14176.cc: New.
 	* include/ext/mt_allocator.h: Formatting fixes.
-	
+
 2004-03-11  Dhruv Matani  <dhruvbird@HotPOP.com>
 
 	* include/Makefile.am (ext_headers): Add
@@ -551,7 +557,7 @@
 	* include/Makefile.in: Regenerate.
 	* docs/html/ext/ballocator_doc.txt: New file.
 	* include/ext/bitmap_allocator.h: New file.
-	* testsuite/performance/20_util/allocator/list_sort_search.cc: Add 
+	* testsuite/performance/20_util/allocator/list_sort_search.cc: Add
 	test.
 	* testsuite/performance/20_util/allocator/map_mt_find.cc: Likewise.
 	* testsuite/performance/20_util/allocator/producer_consumer.cc: Add
@@ -617,7 +623,7 @@
 	* testsuite/22_locale/locale/cons/12658_thread.cc: Catch exceptions.
 
 2004-03-08  Benjamin Kosnik  <bkoz@redhat.com>
-	
+
 	PR c++/13658
 	* testsuite/23_containers/deque/modifiers/swap.cc: New.
 	* testsuite/23_containers/list/modifiers/swap.cc: New.
@@ -626,7 +632,7 @@
 	* testsuite/23_containers/multiset/modifiers/swap.cc: New.
 	* testsuite/23_containers/set/modifiers/swap.cc: New.
 	* testsuite/23_containers/vector/modifiers/swap.cc: New.
-	
+
 2004-03-08  Petur Runolfsson  <peturr02@ru.is>
 
 	PR libstdc++/12658
@@ -651,7 +657,7 @@
 
 	* include/bits/locale_facets.tcc (money_get<>::do_get(long_double&)):
 	Remove redundant conditional on __str.size().
-	
+
 2004-03-08  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/bits/allocator.h: Switch defaults to mt_alloc.
@@ -666,8 +672,8 @@
 	PR libstdc++/12658
 	* src/locale_init.cc (locale::locale): Lock critical regions with
 	external mutexes.
-	(locale::global): Same.	
-	* include/bits/concurrence.h (__glibcxx_mutex_define_initialized): 
+	(locale::global): Same.
+	* include/bits/concurrence.h (__glibcxx_mutex_define_initialized):
 	Add in once bits for cases without __GTHREAD_MUTEX_INIT.
 	(__glibcxx_mutex_lock): Same.
 
@@ -681,7 +687,7 @@
 
 	* config/linker-map.gnu: Remove types in the signature of atomic
 	exports, as they may vary.
-	
+
 2004-03-06  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/locale_facets.tcc: Tweak the comment preceding
@@ -717,7 +723,7 @@
 	* testsuite/23_containers/multiset/insert/1.cc: Test result string.
 
 	* testsuite/23_containers/bitset/invalidation/1.cc: Main always
-	returns 0.	
+	returns 0.
 	* testsuite/23_containers/deque/invalidation/4.cc: Same.
 	* testsuite/23_containers/list/invalidation/1.cc: Same.
 	* testsuite/23_containers/list/invalidation/2.cc: Same.
@@ -740,7 +746,7 @@
 	* scripts/testsuite_flags.in: Add "-D_GLIBCXX_ASSERT" to
 	CXXFLAGS_save.
 	* testsuite/lib/libstdc++.exp: Don't add it conditionally to
-	DEFAULT_CXXFLAGS. 
+	DEFAULT_CXXFLAGS.
 	* testsuite/18_support/numeric_limits.cc: Remove "-D_GLIBCXX_ASSERT"
 	from the dg-options.
 	* testsuite/23_containers/vector/invalidation/1.cc: Likewise.
@@ -773,20 +779,20 @@
 	* testsuite/22_locale/ctype/is/wchar_t/2.cc: Same.
 	* testsuite/22_locale/ctype/is/char/2.cc: Same.
 	* testsuite/thread/pthread7-rope.cc: Same.
-	* testsuite/thread/pthread6.cc: Same.	
-	* testsuite/thread/pthread5.cc: Same.		
-	* testsuite/thread/pthread4.cc: Same.	
+	* testsuite/thread/pthread6.cc: Same.
+	* testsuite/thread/pthread5.cc: Same.
+	* testsuite/thread/pthread4.cc: Same.
 	* testsuite/thread/pthread1.cc: Same.
 	* testsuite/ext/rope.cc: Same.
 	* testsuite/ext/hash_set.cc: Same.
-	* testsuite/ext/hash_map.cc: Same.	
+	* testsuite/ext/hash_map.cc: Same.
 	* testsuite/ext/concept_checks.cc: Same.
 	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc: Same.
 	* testsuite/25_algorithms/unique/2.cc: Same.
 	* testsuite/25_algorithms/unique/1.cc: Same.
 	* testsuite/25_algorithms/rotate.cc: Same.
 	* testsuite/25_algorithms/min_max.cc: Same.
-	* testsuite/25_algorithms/equal.cc: Same.	
+	* testsuite/25_algorithms/equal.cc: Same.
 	* testsuite/24_iterators/rel_ops.cc: Same.
 	* testsuite/24_iterators/iterator.cc: Same.
 	* testsuite/24_iterators/insert_iterator.cc: Same.
@@ -797,7 +803,7 @@
 	* testsuite/23_containers/vector/modifiers/1.cc: Same.
 	* testsuite/23_containers/vector/invalidation/4.cc: Same.
 	* testsuite/23_containers/vector/invalidation/3.cc: Same.
-	* testsuite/23_containers/vector/invalidation/2.cc: Same.	
+	* testsuite/23_containers/vector/invalidation/2.cc: Same.
 	* testsuite/23_containers/vector/invalidation/1.cc: Same.
 	* testsuite/23_containers/vector/element_access/1.cc: Same.
 	* testsuite/23_containers/vector/cons/6513.cc: Same.
@@ -813,7 +819,7 @@
 	* testsuite/23_containers/queue/members/7157.cc: Same.
 	* testsuite/23_containers/priority_queue/members/7161.cc: Same.
 	* testsuite/23_containers/multiset/invalidation/2.cc: Same.
-	* testsuite/23_containers/multiset/invalidation/2.cc: Same.	
+	* testsuite/23_containers/multiset/invalidation/2.cc: Same.
 	* testsuite/23_containers/multiset/insert/1.cc: Same.
 	* testsuite/23_containers/multimap/invalidation/2.cc: Same.
 	* testsuite/23_containers/multimap/invalidation/2.cc: Same.
@@ -831,7 +837,7 @@
 	* testsuite/23_containers/list/invalidation/4.cc: Same.
 	* testsuite/23_containers/list/invalidation/3.cc: Same.
 	* testsuite/23_containers/list/invalidation/2.cc: Same.
-	* testsuite/23_containers/list/invalidation/1.cc: Same.	
+	* testsuite/23_containers/list/invalidation/1.cc: Same.
 	* testsuite/23_containers/list/cons/9.cc: Same.
 	* testsuite/23_containers/list/cons/8.cc: Same.
 	* testsuite/23_containers/list/cons/7.cc: Same.
@@ -913,7 +919,7 @@
 	* acconfig.h: Remove _GLIBCXX_SUPPORTS_WEAK.
 	* config.h.in: Regenerate.
 	* configure: Same.
-	
+
 2004-03-01  Benjamin Kosnik  <bkoz@redhat.com>
 
 	Support autoconf 2.59
@@ -927,7 +933,7 @@
 
 	* docs/html/18_support/howto.html: Add bit about writing to
 	stderr, mostly by Zack.
-	
+
 2004-03-01  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/locale_facets.tcc (money_get<>::_M_extract,
@@ -946,7 +952,7 @@
 	and decimal_point; tweak a bit.
 	* testsuite/22_locale/num_get/get/char/15.cc: New.
 	* testsuite/22_locale/num_get/get/wchar_t/15.cc: New.
-	
+
 	* include/bits/locale_facets.tcc (num_get<>::_M_extract_float,
 	num_get<>::_M_extract_int): Reorder some conditionals.
 
@@ -957,10 +963,10 @@
 	22.2.6.3, p3 for the thousands separators; tweak a bit.
 	* testsuite/22_locale/money_get/get/char/15.cc: New.
 	* testsuite/22_locale/money_get/get/wchar_t/15.cc: New.
-	
+
 2004-03-01  David Billinghurst <David.Billinghurst@riotinto.com>
 
-	* testsuite/lib/libstdc++.exp (v3-list-tests): Use 
+	* testsuite/lib/libstdc++.exp (v3-list-tests): Use
 	testsuite_files from correct multilib blddir when running
 	testsuite.
 
@@ -987,7 +993,7 @@
 	* testsuite/22_locale/num_get/get/wchar_t/14.cc: New.
 
 2004-02-27  Eric Christopher  <echristo@redhat.com>
-            Phil Edwards  <phil@codesourcery.com>
+	    Phil Edwards  <phil@codesourcery.com>
 
 	* testsuite/22_locale/collate/compare/wchar_t/2.cc,
 	testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc,
@@ -1002,7 +1008,7 @@
 	* testsuite/lib/libstdc++.exp:  Load target-supports.exp.
 
 2004-02-27  Phil Edwards  <phil@codesourcery.com>
-            Eric Christopher  <echristo@redhat.com>
+	    Eric Christopher  <echristo@redhat.com>
 
 	* testsuite/config/default.exp:  Update with comments.
 	(${tool}_target_compile):  New wrapper routine.
@@ -1069,23 +1075,23 @@
 2004-02-26  Benjamin Kosnik  <bkoz@redhat.com>
 
 	PR libstdc++/10246
-        * libsupc++/Makefile.am: Use libiberty demangler.
-        (c_sources): Add cp-demangle.c.
-        * libsupc++/Makefile.in: Regenerate.
-        * src/Makefile.am (sources): Remove demangle.cc.
-        * src/Makefile.in: Regenerate.
-        * include/Makefile.am (bits_headers): Move demangle.h.
+	* libsupc++/Makefile.am: Use libiberty demangler.
+	(c_sources): Add cp-demangle.c.
+	* libsupc++/Makefile.in: Regenerate.
+	* src/Makefile.am (sources): Remove demangle.cc.
+	* src/Makefile.in: Regenerate.
+	* include/Makefile.am (bits_headers): Move demangle.h.
 	(ext_headers): ...here.
-        * include/Makefile.in: Regenerate.
-        * include/bits/demangle.h: Move...
+	* include/Makefile.in: Regenerate.
+	* include/bits/demangle.h: Move...
 	* include/ext/demangle.h: ...here.
-        * src/demangle.cc: Remove.
+	* src/demangle.cc: Remove.
 
 2004-02-26  Benjamin Kosnik  <bkoz@redhat.com>
- 
-        * include/bits/demangle.h: Add type template parameter to all
-        templates with just an Allocator template parameter.
- 
+
+	* include/bits/demangle.h: Add type template parameter to all
+	templates with just an Allocator template parameter.
+
 2004-02-25  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/bits/atomicity.h: New, forward declarations for __atomic_add
@@ -1119,7 +1125,7 @@
 	* config/cpu/powerpc/atomicity.h: Same.
 	* config/cpu/s390/atomicity.h: Same.
 	* config/cpu/sparc/atomicity.h: Same.
-	
+
 	* src/Makefile.am (host_sources): Add atomicity.cc.
 	(atomicity.cc): New rule.
 	* src/Makefile.in: Regenerate.
@@ -1135,8 +1141,8 @@
 	* config/linker-map.gnu: Export __exchange_and_add, and __atomic_add.
 
 	* testsuite/27_io/ios_base/cons/assign_neg.cc: Adjust line numbers.
-	* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.	
-	
+	* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
+
 2004-02-25  Jonathan Wakely  <redi@gcc.gnu.org>
 
 	* docs/html/20_util/howto.html, docs/html/20_util/allocator.html,
@@ -1173,20 +1179,20 @@
 
 	* libsupc++/vterminate.cc (__gnu_cxx::__verbose_terminate_handler):
 	Only use fputs, not write.
-	
+
 2004-02-23  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/ext/malloc_allocator.h: Add operators ==, !=.
 	* include/ext/new_allocator.h: Add operators ==, !=.
 	* include/ext/mt_allocator.h (__mt_alloc::tune): New.
 	(__mt_alloc::_S_get_options): New.
-	(__mt_alloc::_S_set_options): New.	
+	(__mt_alloc::_S_set_options): New.
 	(__mt_alloc::_S_thread_key_destr): To _S_destroy_thread_key.
 	(__mt_alloc::_S_no_of_bins): To _S_bin_size.
 	Move functions out of line, simplify, format.
 	* src/allocator.cc: Simplify explicit instantiations.
 	* include/bits/allocator.h: Tweak.
-	
+
 2004-02-22  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/bits/locale_facets.tcc (money_put<>::_M_insert):
@@ -1203,12 +1209,12 @@
 	avoid multiple reallocations; fix parsing of sign component
 	according to 22.2.6.1.2, p3.
 	(money_get<>::do_get(long double&),
-	money_get<>::do_get(string_type&)): Update calls of _M_extract.	
+	money_get<>::do_get(string_type&)): Update calls of _M_extract.
 	* src/locale-inst.cc:  Add instantiations of
 	money_get::_M_extract<false> and money_get::_M_extract<true>.
 	* testsuite/22_locale/money_get/get/char/14.cc: New.
 	* testsuite/22_locale/money_get/get/wchar_t/14.cc: Ditto.
-	
+
 2004-02-21  Mark Mitchell  <mark@codesourcery.com>
 
 	* libsupc++/vterminate.cc
@@ -1396,7 +1402,7 @@
 	(__basic_file<char>::xwrite): Move to __gnu_internal and make
 	static.
 	(__basic_file<char>::xsputn): Update call.
-	(__basic_file<char>::xsputn_2): Likewise.	
+	(__basic_file<char>::xsputn_2): Likewise.
 	* config/io/basic_file_stdio.h (__basic_file<char>::xwrite):
 	Don't declare, now static.
 
@@ -1492,7 +1498,7 @@
 2004-02-08  Richard Henderson  <rth@redhat.com>
 
 	PR libstdc++/14026
-	* libsupc++/eh_catch.cc (__cxa_begin_catch): Don't adjust 
+	* libsupc++/eh_catch.cc (__cxa_begin_catch): Don't adjust
 	uncaughtExceptions during nested catch rethrow.
 	* testsuite/18_support/14026.cc: New.
 
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index 0dffb3e..c58d008 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -30,7 +30,8 @@ AM_RUNTESTFLAGS =
 
 ## CXX is actually a "C" compiler. These are real C++ programs.
 testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags
-CXX=`${testsuite_flags_script} --build-cxx`
+CXX         = $(shell ${testsuite_flags_script} --build-cxx)
+AM_CXXFLAGS = $(shell ${testsuite_flags_script} --cxxflags)
 
 GLIBGCC_DIR=`$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'`
 GLIBCXX_DIR=${glibcxx_builddir}/src/.libs
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index adc8116..bd00606 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -115,7 +115,7 @@ CPPFLAGS = @CPPFLAGS@
 CSTDIO_H = @CSTDIO_H@
 CTIME_CC = @CTIME_CC@
 CTIME_H = @CTIME_H@
-CXX = `${testsuite_flags_script} --build-cxx`
+CXX = $(shell ${testsuite_flags_script} --build-cxx)
 CXXCPP = @CXXCPP@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -266,6 +266,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
 AM_MAKEFLAGS = -j1
 AM_RUNTESTFLAGS = 
 testsuite_flags_script = ${glibcxx_builddir}/scripts/testsuite_flags
+AM_CXXFLAGS = $(shell ${testsuite_flags_script} --cxxflags)
 GLIBGCC_DIR = `$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'`
 GLIBCXX_DIR = ${glibcxx_builddir}/src/.libs
 CXXLINK = \