This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[v3] try_named_locale removal


Hi,

tested on an x86-linux system (+ various different sabotages ;),
committed to mainline.

Paolo.

//////////////
2005-05-18  Paolo Carlini  <pcarlini@suse.de>

	* testsuite/testsuite_hooks.cc: Remove try_named_locale.
	* testsuite/testsuite_hooks.h: Remove try_named_locale.
	* testsuite/lib/libstdc++.exp (check_v3_target_namedlocale): New.
	* testsuite/lib/dg-options.exp (dg-require-namedlocale): New, uses
	the above.
	* testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc: Use
	dg-require-namedlocale.
	* testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc: Likewise.
	* testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc: Likewise.
	* testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc: Likewise.
	* testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc: 
	Likewise.
	* testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc: Likewise.
	* testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc: Likewise.
	* testsuite/22_locale/codecvt/encoding/wchar_t/2.cc: Likewise.
	* testsuite/22_locale/codecvt/encoding/wchar_t/3.cc: Likewise.
	* testsuite/22_locale/codecvt/encoding/wchar_t/4.cc: Likewise.
	* testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc: Likewise.
	* testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/codecvt/in/char/wrapped_env.cc: Likewise.
	* testsuite/22_locale/codecvt/in/char/wrapped_locale.cc: Likewise.
	* testsuite/22_locale/codecvt/in/wchar_t/2.cc: Likewise.
	* testsuite/22_locale/codecvt/in/wchar_t/3.cc: Likewise.
	* testsuite/22_locale/codecvt/in/wchar_t/4.cc: Likewise.
	* testsuite/22_locale/codecvt/in/wchar_t/7.cc: Likewise. 
	* testsuite/22_locale/codecvt/in/wchar_t/8.cc: Likewise.
	* testsuite/22_locale/codecvt/in/wchar_t/9.cc: Likewise.
	* testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc: Likewise. 
	* testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc: Likewise.    
	* testsuite/22_locale/codecvt/length/char/wrapped_env.cc: Likewise. 
	* testsuite/22_locale/codecvt/length/char/wrapped_locale.cc: Likewise.    
	* testsuite/22_locale/codecvt/length/wchar_t/2.cc: Likewise.   
	* testsuite/22_locale/codecvt/length/wchar_t/3.cc: Likewise.   
	* testsuite/22_locale/codecvt/length/wchar_t/4.cc: Likewise.   
	* testsuite/22_locale/codecvt/length/wchar_t/7.cc: Likewise.   
	* testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc: Likewise.      
	* testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc: Likewise.
	* testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc:
	Likewise.  
	* testsuite/22_locale/codecvt/max_length/wchar_t/2.cc: Likewise.    
	* testsuite/22_locale/codecvt/max_length/wchar_t/3.cc: Likewise.    
	* testsuite/22_locale/codecvt/max_length/wchar_t/4.cc: Likewise.    
	* testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc:
	Likewise.  
	* testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/codecvt/out/char/wrapped_env.cc: Likewise.    
	* testsuite/22_locale/codecvt/out/char/wrapped_locale.cc: Likewise. 
	* testsuite/22_locale/codecvt/out/wchar_t/2.cc: Likewise.  
	* testsuite/22_locale/codecvt/out/wchar_t/3.cc: Likewise.  
	* testsuite/22_locale/codecvt/out/wchar_t/4.cc: Likewise.  
	* testsuite/22_locale/codecvt/out/wchar_t/7.cc: Likewise.  
	* testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc: Likewise. 
	* testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc: Likewise. 
	* testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc: Likewise.   
	* testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc: Likewise.
	* testsuite/22_locale/codecvt/unshift/wchar_t/2.cc: Likewise.    
	* testsuite/22_locale/codecvt/unshift/wchar_t/3.cc: Likewise.    
	* testsuite/22_locale/codecvt/unshift/wchar_t/4.cc: Likewise.    
	* testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc: Likewise.
	* testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/collate/compare/char/1.cc: Likewise.  
	* testsuite/22_locale/collate/compare/char/2.cc: Likewise.  
	* testsuite/22_locale/collate/compare/char/3.cc: Likewise.  
	* testsuite/22_locale/collate/compare/char/wrapped_env.cc: Likewise.        
	* testsuite/22_locale/collate/compare/char/wrapped_locale.cc: Likewise.     
	* testsuite/22_locale/collate/compare/wchar_t/1.cc: Likewise.     
	* testsuite/22_locale/collate/compare/wchar_t/2.cc: Likewise.     
	* testsuite/22_locale/collate/compare/wchar_t/3.cc: Likewise.     
	* testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc: Likewise.
	* testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc:
	Likewise.  
	* testsuite/22_locale/collate/hash/char/2.cc: Likewise.     
	* testsuite/22_locale/collate/hash/char/wrapped_env.cc: Likewise.   
	* testsuite/22_locale/collate/hash/char/wrapped_locale.cc: Likewise.        
	* testsuite/22_locale/collate/hash/wchar_t/2.cc: Likewise.  
	* testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc: Likewise.
	* testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc: Likewise.     
	* testsuite/22_locale/collate/transform/char/2.cc: Likewise.     
	* testsuite/22_locale/collate/transform/char/3.cc: Likewise.     
	* testsuite/22_locale/collate/transform/char/wrapped_env.cc: Likewise.      
	* testsuite/22_locale/collate/transform/char/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/collate/transform/wchar_t/2.cc: Likewise. 
	* testsuite/22_locale/collate/transform/wchar_t/3.cc: Likewise. 
	* testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc:
	Likewise.
	* testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/collate_byname/named_equivalence.cc: Likewise.
	* testsuite/22_locale/ctype/cons/char/wrapped_env.cc: Likewise.    
	* testsuite/22_locale/ctype/cons/char/wrapped_locale.cc: Likewise. 
	* testsuite/22_locale/ctype/is/char/2.cc: Likewise. 
	* testsuite/22_locale/ctype/is/char/wrapped_env.cc: Likewise.      
	* testsuite/22_locale/ctype/is/char/wrapped_locale.cc: Likewise.  
	* testsuite/22_locale/ctype/is/wchar_t/2.cc: Likewise.   
	* testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc: Likewise.  
	* testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc: Likewise.
	* testsuite/22_locale/ctype/narrow/char/wrapped_env.cc: Likewise.
	* testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc: Likewise.        
	* testsuite/22_locale/ctype/narrow/wchar_t/3.cc: Likewise. 
	* testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc: Likewise.        
	* testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc: Likewise.
	* testsuite/22_locale/ctype/scan/char/wrapped_env.cc: Likewise.   
	* testsuite/22_locale/ctype/scan/char/wrapped_locale.cc: Likewise. 
	* testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc: Likewise. 
	* testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc: Likewise.       
	* testsuite/22_locale/ctype/to/char/wrapped_env.cc: Likewise.       
	* testsuite/22_locale/ctype/to/char/wrapped_locale.cc: Likewise.    
	* testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc: Likewise.    
	* testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc: Likewise. 
	* testsuite/22_locale/ctype/widen/char/wrapped_env.cc: Likewise.    
	* testsuite/22_locale/ctype/widen/char/wrapped_locale.cc: Likewise. 
	* testsuite/22_locale/ctype/widen/wchar_t/2.cc: Likewise.   
	* testsuite/22_locale/ctype/widen/wchar_t/3.cc: Likewise.   
	* testsuite/22_locale/ctype/widen/wchar_t/wrapped_env.cc: Likewise.
	* testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc: Likewise.
	* testsuite/22_locale/facet/2.cc: Likewise.
	* testsuite/22_locale/locale/cons/12352.cc: Likewise.
	* testsuite/22_locale/locale/cons/12438.cc: Likewise.
	* testsuite/22_locale/locale/cons/12658_thread-1.cc: Likewise. 
	* testsuite/22_locale/locale/cons/12658_thread-2.cc: Likewise. 
	* testsuite/22_locale/locale/cons/2.cc: Likewise.
	* testsuite/22_locale/locale/cons/4.cc: Likewise.
	* testsuite/22_locale/locale/cons/5.cc: Likewise.
	* testsuite/22_locale/locale/cons/7.cc: Likewise.
	* testsuite/22_locale/locale/cons/7222-env.cc: Likewise.  
	* testsuite/22_locale/locale/global_locale_objects/14071.cc: Likewise.  
	* testsuite/22_locale/locale/global_locale_objects/2.cc: Likewise.
	* testsuite/22_locale/messages/members/char/1.cc: Likewise.
	* testsuite/22_locale/messages/members/char/2.cc: Likewise.
	* testsuite/22_locale/messages/members/char/3.cc: Likewise.
	* testsuite/22_locale/messages/members/char/wrapped_env.cc: Likewise.   
	* testsuite/22_locale/messages/members/char/wrapped_locale.cc: Likewise.
	* testsuite/22_locale/messages_byname/named_equivalence.cc: Likewise.   
	* testsuite/22_locale/money_get/get/char/1.cc: Likewise.    
	* testsuite/22_locale/money_get/get/char/10.cc: Likewise.   
	* testsuite/22_locale/money_get/get/char/11.cc: Likewise.   
	* testsuite/22_locale/money_get/get/char/11528.cc: Likewise.
	* testsuite/22_locale/money_get/get/char/12.cc: Likewise.   
	* testsuite/22_locale/money_get/get/char/13.cc: Likewise.   
	* testsuite/22_locale/money_get/get/char/15.cc: Likewise.   
	* testsuite/22_locale/money_get/get/char/16.cc: Likewise.   
	* testsuite/22_locale/money_get/get/char/17.cc: Likewise.   
	* testsuite/22_locale/money_get/get/char/18.cc: Likewise.   
	* testsuite/22_locale/money_get/get/char/2.cc: Likewise.    
	* testsuite/22_locale/money_get/get/char/3.cc: Likewise.    
	* testsuite/22_locale/money_get/get/char/4.cc: Likewise.    
	* testsuite/22_locale/money_get/get/char/wrapped_env.cc: Likewise. 
	* testsuite/22_locale/money_get/get/char/wrapped_locale.cc: Likewise.  
	* testsuite/22_locale/money_get/get/wchar_t/1.cc: Likewise. 
	* testsuite/22_locale/money_get/get/wchar_t/10.cc: Likewise.      
	* testsuite/22_locale/money_get/get/wchar_t/11.cc: Likewise.      
	* testsuite/22_locale/money_get/get/wchar_t/11528.cc: Likewise.
	* testsuite/22_locale/money_get/get/wchar_t/12.cc: Likewise.      
	* testsuite/22_locale/money_get/get/wchar_t/13.cc: Likewise.      
	* testsuite/22_locale/money_get/get/wchar_t/15.cc: Likewise.      
	* testsuite/22_locale/money_get/get/wchar_t/16.cc: Likewise.      
	* testsuite/22_locale/money_get/get/wchar_t/17.cc: Likewise.      
	* testsuite/22_locale/money_get/get/wchar_t/18.cc: Likewise.      
	* testsuite/22_locale/money_get/get/wchar_t/2.cc: Likewise. 
	* testsuite/22_locale/money_get/get/wchar_t/3.cc: Likewise. 
	* testsuite/22_locale/money_get/get/wchar_t/4.cc: Likewise. 
	* testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc: Likewise.      
	* testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc: Likewise.
	* testsuite/22_locale/money_put/put/char/1.cc: Likewise.  
	* testsuite/22_locale/money_put/put/char/2.cc: Likewise.  
	* testsuite/22_locale/money_put/put/char/3.cc: Likewise.  
	* testsuite/22_locale/money_put/put/char/9780-3.cc: Likewise.      
	* testsuite/22_locale/money_put/put/char/wrapped_env.cc: Likewise. 
	* testsuite/22_locale/money_put/put/char/wrapped_locale.cc: Likewise.  
	* testsuite/22_locale/money_put/put/wchar_t/1.cc: Likewise. 
	* testsuite/22_locale/money_put/put/wchar_t/2.cc: Likewise. 
	* testsuite/22_locale/money_put/put/wchar_t/3.cc: Likewise. 
	* testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc: Likewise.     
	* testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc: Likewise.
	* testsuite/22_locale/moneypunct/members/char/2.cc: Likewise.
	* testsuite/22_locale/moneypunct/members/char/wrapped_env.cc: Likewise.    
	* testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc:
	Likewise. 
	* testsuite/22_locale/moneypunct/members/wchar_t/2.cc: Likewise.   
	* testsuite/22_locale/moneypunct/members/wchar_t/wrapped_env.cc:
	Likewise.
	* testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/moneypunct_byname/named_equivalence.cc: Likewise.
	* testsuite/22_locale/num_get/get/char/1.cc: Likewise.   
	* testsuite/22_locale/num_get/get/char/3.cc: Likewise.   
	* testsuite/22_locale/num_get/get/char/5.cc: Likewise.   
	* testsuite/22_locale/num_get/get/char/6.cc: Likewise.   
	* testsuite/22_locale/num_get/get/char/9.cc: Likewise.   
	* testsuite/22_locale/num_get/get/char/wrapped_env.cc: Likewise.
	* testsuite/22_locale/num_get/get/char/wrapped_locale.cc: Likewise. 
	* testsuite/22_locale/num_get/get/wchar_t/1.cc: Likewise.  
	* testsuite/22_locale/num_get/get/wchar_t/3.cc: Likewise.  
	* testsuite/22_locale/num_get/get/wchar_t/5.cc: Likewise.  
	* testsuite/22_locale/num_get/get/wchar_t/6.cc: Likewise.  
	* testsuite/22_locale/num_get/get/wchar_t/9.cc: Likewise.  
	* testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc: Likewise. 
	* testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc: Likewise. 
	* testsuite/22_locale/num_put/put/char/1.cc: Likewise.      
	* testsuite/22_locale/num_put/put/char/20909.cc: Likewise.  
	* testsuite/22_locale/num_put/put/char/20914.cc: Likewise.  
	* testsuite/22_locale/num_put/put/char/3.cc: Likewise.      
	* testsuite/22_locale/num_put/put/char/5.cc: Likewise.      
	* testsuite/22_locale/num_put/put/char/9780-2.cc: Likewise. 
	* testsuite/22_locale/num_put/put/char/wrapped_env.cc: Likewise.    
	* testsuite/22_locale/num_put/put/char/wrapped_locale.cc: Likewise. 
	* testsuite/22_locale/num_put/put/wchar_t/1.cc: Likewise. 
	* testsuite/22_locale/num_put/put/wchar_t/20909.cc: Likewise.   
	* testsuite/22_locale/num_put/put/wchar_t/20914.cc: Likewise.   
	* testsuite/22_locale/num_put/put/wchar_t/3.cc: Likewise. 
	* testsuite/22_locale/num_put/put/wchar_t/5.cc: Likewise.
	* testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc: Likewise.
	* testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc: Likewise. 
	* testsuite/22_locale/numpunct/members/char/2.cc: Likewise.
	* testsuite/22_locale/numpunct/members/char/3.cc: Likewise.
	* testsuite/22_locale/numpunct/members/char/wrapped_env.cc: Likewise.    
	* testsuite/22_locale/numpunct/members/char/wrapped_locale.cc: Likewise.
	* testsuite/22_locale/numpunct/members/wchar_t/2.cc: Likewise.    
	* testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc: Likewise.
	* testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc:
	Likewise. 
	* testsuite/22_locale/numpunct_byname/named_equivalence.cc: Likewise.       
	* testsuite/22_locale/time_get/date_order/char/wrapped_env.cc: Likewise.    
	* testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc:
	Likewise. 
	* testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc:
	Likewise. 
	* testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/time_get/get_date/char/12750.cc: Likewise.
	* testsuite/22_locale/time_get/get_date/char/2.cc: Likewise.   
	* testsuite/22_locale/time_get/get_date/char/wrapped_env.cc: Likewise.      
	* testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/time_get/get_date/wchar_t/12750.cc: Likewise. 
	* testsuite/22_locale/time_get/get_date/wchar_t/2.cc: Likewise.     
	* testsuite/22_locale/time_get/get_date/wchar_t/4.cc: Likewise.     
	* testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc:
	Likewise.  
	* testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/time_get/get_monthname/char/2.cc: Likewise.  
	* testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc:
	Likewise.
	* testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc: Likewise.
	* testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc:
	Likewise.
	* testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/time_get/get_time/char/1.cc: Likewise.
	* testsuite/22_locale/time_get/get_time/char/2.cc: Likewise.
	* testsuite/22_locale/time_get/get_time/char/wrapped_env.cc: Likewise.
	* testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/time_get/get_time/wchar_t/1.cc: Likewise.
	* testsuite/22_locale/time_get/get_time/wchar_t/2.cc: Likewise.
	* testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc:
	Likewise. 
	* testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc:
	Likewise.
	* testsuite/22_locale/time_get/get_weekday/char/2.cc: Likewise.
	* testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc:
	Likewise.
	* testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc:
	Likewise. 
	* testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc: Likewise.
	* testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc:
	Likewise.    
	* testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc:
	Likewise. 
	* testsuite/22_locale/time_put/put/char/17038.cc: Likewise. 
	* testsuite/22_locale/time_put/put/char/2.cc: Likewise.     
	* testsuite/22_locale/time_put/put/char/3.cc: Likewise.     
	* testsuite/22_locale/time_put/put/char/4.cc: Likewise.     
	* testsuite/22_locale/time_put/put/char/6.cc: Likewise.     
	* testsuite/22_locale/time_put/put/char/7.cc: Likewise.     
	* testsuite/22_locale/time_put/put/char/8.cc: Likewise.     
	* testsuite/22_locale/time_put/put/char/9780-1.cc: Likewise.       
	* testsuite/22_locale/time_put/put/char/wrapped_env.cc: Likewise.
	* testsuite/22_locale/time_put/put/char/wrapped_locale.cc: Likewise.  
	* testsuite/22_locale/time_put/put/wchar_t/17038.cc: Likewise.   
	* testsuite/22_locale/time_put/put/wchar_t/2.cc: Likewise.
	* testsuite/22_locale/time_put/put/wchar_t/3.cc: Likewise.
	* testsuite/22_locale/time_put/put/wchar_t/4.cc: Likewise.
	* testsuite/22_locale/time_put/put/wchar_t/6.cc: Likewise.
	* testsuite/22_locale/time_put/put/wchar_t/7.cc: Likewise.
	* testsuite/22_locale/time_put/put/wchar_t/8.cc: Likewise.
	* testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc: Likewise.     
	* testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/13007.cc: Likewise.  
	* testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/char/2.cc: Likewise. 
	* testsuite/27_io/basic_filebuf/imbue/char/9322.cc: Likewise.       
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/12868.cc: Likewise.
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc: Likewise.   
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc: Likewise. 
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc: Likewise. 
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc: Likewise. 
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc: Likewise. 
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc: Likewise.       
	* testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc: Likewise.    
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc: Likewise.  
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc: Likewise.  
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc: Likewise.  
	* testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc: Likewise.  
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc: Likewise.    
	* testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc: Likewise.    
	* testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc: Likewise. 
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc: Likewise.  
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc: Likewise.  
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc: Likewise.  
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc: Likewise.  
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc: Likewise.  
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc: Likewise.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc: Likewise.        
	* testsuite/27_io/basic_ios/copyfmt/char/2.cc: Likewise.   
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc:
	Likewise.   
	* testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc:
	Likewise.
	* testsuite/27_io/basic_streambuf/imbue/char/13007-1.cc: Likewise.
	* testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc: Likewise.
	* testsuite/27_io/basic_streambuf/imbue/char/9322.cc: Likewise.  
	* testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-1.cc: Likewise.    
	* testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc: Likewise.    
	* testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc: Likewise. 
	* testsuite/27_io/basic_stringbuf/imbue/char/9322.cc: Likewise.    
	* testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc: Likewise.
	* testsuite/27_io/objects/wchar_t/10.cc: Likewise. 
	* testsuite/27_io/objects/wchar_t/11.cc: Likewise. 
	* testsuite/27_io/objects/wchar_t/12.cc: Likewise. 
	* testsuite/27_io/objects/wchar_t/13.cc: Likewise. 
	* testsuite/27_io/objects/wchar_t/9520.cc: Likewise.
	* testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc: Likewise.
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc	2003-07-24 23:07:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc	2005-05-17 18:05:00.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc	2003-07-24 23:07:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc	2005-05-17 18:05:14.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc	2003-09-23 22:02:13.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc	2005-05-17 18:05:39.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   bool test __attribute__((unused)) = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
+  locale loc = locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc	2003-09-23 22:02:13.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc	2005-05-17 18:05:56.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   bool test __attribute__((unused)) = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc	2003-09-23 22:02:13.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc	2005-05-17 18:06:11.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   bool test __attribute__((unused)) = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
+  locale loc = locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc	2003-07-24 23:07:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc	2005-05-17 18:06:28.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc	2003-07-24 23:07:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc	2005-05-17 18:06:39.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc	2003-07-24 23:07:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc	2005-05-17 18:02:07.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc	2003-07-24 23:07:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc	2005-05-17 18:02:26.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc	2003-09-23 22:02:13.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc	2005-05-17 18:03:53.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
   bool test __attribute__((unused)) = true;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
+  locale loc = locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc	2003-09-23 22:02:13.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc	2005-05-17 18:04:12.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
   bool test __attribute__((unused)) = true;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc	2003-09-23 22:02:13.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc	2005-05-17 18:04:32.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
   bool test __attribute__((unused)) = true;
 
-  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
+  locale loc = locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc	2003-07-24 23:07:32.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc	2005-05-17 18:02:49.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc	2003-07-24 23:07:32.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc	2005-05-17 18:03:31.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/in/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/in/char/wrapped_env.cc	2003-07-24 23:07:32.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_env.cc	2005-05-17 18:07:06.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc	2003-07-24 23:07:32.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc	2005-05-17 18:07:15.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/2.cc	2003-09-23 22:02:14.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc	2005-05-17 18:08:21.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -88,7 +90,7 @@
   wmemset(i_ref, 0xdeadbeef, size + 1);
   int_type*		ito_next;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
+  locale loc = locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/3.cc	2003-09-23 22:02:14.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc	2005-05-17 18:08:41.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -102,7 +104,7 @@
   wmemset(i_ref, 0xdeadbeef, size + 1);
   int_type*		ito_next;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/4.cc libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/4.cc	2003-09-23 22:02:14.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc	2005-05-17 18:09:00.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -110,7 +112,7 @@
   wmemset(i_ref, 0xdeadbeef, esize + 1);
   int_type*		ito_next;
 
-  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
+  locale loc = locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/7.cc libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/7.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/7.cc	2003-09-23 22:02:14.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/7.cc	2005-05-17 18:09:19.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -60,7 +62,7 @@
   wmemset(i_ref, 0xdeadbeef, size + 1);
   int_type*		ito_next;
 
-  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
+  locale loc = locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/8.cc libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/8.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/8.cc	2003-09-23 22:02:14.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/8.cc	2005-05-17 18:09:40.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -109,7 +111,7 @@
   wmemset(i_ref, 0xdeadbeef, esize + 1);
   int_type*		ito_next;
 
-  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
+  locale loc = locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/9.cc libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/9.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/9.cc	2003-09-23 22:02:14.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/9.cc	2005-05-17 18:09:56.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -111,7 +113,7 @@
   int_type*		ito = i_arr;
   int_type*		ito_next;
 
-  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
+  locale loc = locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc	2003-07-24 23:07:32.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc	2005-05-17 18:07:37.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc	2003-07-24 23:07:32.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc	2005-05-17 18:07:47.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/length/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/length/char/wrapped_env.cc	2003-07-24 23:07:33.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_env.cc	2005-05-17 18:10:30.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc	2003-07-24 23:07:33.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc	2005-05-17 18:10:43.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/2.cc	2003-09-23 22:02:15.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc	2005-05-17 18:11:18.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -61,7 +63,7 @@
     "\xff";
   int 			size = strlen(e_lit);
 
-  locale  loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
+  locale  loc = locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/3.cc	2003-09-23 22:02:15.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc	2005-05-17 18:11:35.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -61,7 +63,7 @@
     "\xff";
   int 			size = strlen(e_lit);
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/4.cc libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/4.cc	2003-09-23 22:02:15.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/4.cc	2005-05-17 18:11:59.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -99,7 +101,7 @@
   int 			esize = strlen(e_lit);
   int 			isize = wcslen(i_lit);
 
-  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
+  locale loc = locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/7.cc libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/7.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/7.cc	2003-09-23 22:02:15.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/7.cc	2005-05-17 18:12:27.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -51,7 +53,7 @@
   const ext_type* 	e_lit = "a\xc0\xff";
   int 			size = strlen(e_lit);
 
-  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
+  locale loc = locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc	2003-07-24 23:07:33.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc	2005-05-17 18:12:37.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc	2003-07-24 23:07:33.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc	2005-05-17 18:12:48.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc	2003-07-24 23:07:33.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc	2005-05-17 18:13:05.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc	2003-07-24 23:07:33.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc	2005-05-17 18:13:15.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc	2003-09-23 22:02:15.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc	2005-05-17 18:13:39.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -31,7 +33,7 @@
   bool test __attribute__((unused)) = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale  loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
+  locale  loc = locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc	2003-09-23 22:02:15.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc	2005-05-17 18:13:55.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -31,7 +33,7 @@
   bool test __attribute__((unused)) = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc	2003-09-23 22:02:15.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc	2005-05-17 18:14:14.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -31,7 +33,7 @@
   bool test __attribute__((unused)) = true;
   typedef codecvt<wchar_t, char, mbstate_t> 	w_codecvt;
 
-  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
+  locale loc = locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc	2003-07-24 23:07:33.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc	2005-05-17 18:14:28.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc	2003-07-24 23:07:33.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc	2005-05-17 18:14:37.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/out/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/out/char/wrapped_env.cc	2003-07-24 23:07:34.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_env.cc	2005-05-17 18:14:54.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc	2003-07-24 23:07:34.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc	2005-05-17 18:15:04.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/2.cc	2003-09-23 22:02:16.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc	2005-05-17 18:15:29.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -86,7 +88,7 @@
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale  loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
+  locale  loc = locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/3.cc	2003-09-23 22:02:16.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc	2005-05-17 18:15:49.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -100,7 +102,7 @@
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/4.cc libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/4.cc	2003-09-23 22:02:16.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/4.cc	2005-05-17 18:16:11.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -107,7 +109,7 @@
   memset(e_ref, 0xf0, esize + 1);
   ext_type*		eto_next;
 
-  locale  loc = __gnu_test::try_named_locale("en_US.UTF-8");
+  locale  loc = locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/7.cc libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/7.cc	2003-09-23 22:02:16.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc	2005-05-17 18:16:36.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -58,7 +60,7 @@
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
+  locale loc = locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc	2003-07-24 23:07:34.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc	2005-05-17 18:16:48.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc	2003-07-24 23:07:34.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc	2005-05-17 18:16:58.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc	2003-07-24 23:07:34.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc	2005-05-17 18:18:14.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc	2003-07-24 23:07:34.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc	2005-05-17 18:18:26.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc	2003-09-23 22:02:16.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc	2005-05-17 18:18:53.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -71,7 +73,7 @@
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
+  locale loc = locale("en_US.ISO-8859-1");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc	2003-09-23 22:02:16.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc	2005-05-17 18:19:10.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -85,7 +87,7 @@
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15");
+  locale loc = locale("en_US.ISO-8859-15");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/wchar_t/4.cc libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/wchar_t/4.cc	2003-09-23 22:02:16.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/4.cc	2005-05-17 18:19:26.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -80,7 +82,7 @@
   memset(e_ref, 0xf0, size + 1);
   ext_type*		eto_next;
 
-  locale loc = __gnu_test::try_named_locale("en_US.UTF-8");
+  locale loc = locale("en_US.UTF-8");
   locale::global(loc);
   const w_codecvt* 	cvt = &use_facet<w_codecvt>(loc); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc	2003-07-24 23:07:35.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc	2005-05-17 18:19:39.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc	2003-07-24 23:07:35.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc	2005-05-17 18:19:50.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/compare/char/1.cc libstdc++-v3/testsuite/22_locale/collate/compare/char/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/compare/char/1.cc	2003-09-23 22:02:17.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/compare/char/1.cc	2005-05-17 19:18:24.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,9 +35,9 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/compare/char/2.cc libstdc++-v3/testsuite/22_locale/collate/compare/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/compare/char/2.cc	2003-09-23 22:02:17.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/compare/char/2.cc	2005-05-17 19:18:55.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,9 +35,9 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/compare/char/3.cc libstdc++-v3/testsuite/22_locale/collate/compare/char/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/compare/char/3.cc	2003-09-23 22:02:17.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/compare/char/3.cc	2005-05-17 19:19:12.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-24 Petur Runolfsson <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // cache the collate facets
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/compare/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/compare/char/wrapped_env.cc	2003-07-24 23:07:35.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_env.cc	2005-05-17 19:19:28.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/compare/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/compare/char/wrapped_locale.cc	2003-07-24 23:07:35.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc	2005-05-17 19:19:39.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/compare/wchar_t/1.cc libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/compare/wchar_t/1.cc	2003-09-23 22:02:18.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/1.cc	2005-05-17 19:20:02.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,9 +35,9 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/compare/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/compare/wchar_t/2.cc	2005-03-05 02:44:42.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc	2005-05-18 00:35:03.000000000 +0200
@@ -1,6 +1,12 @@
+// { dg-do run }
+// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
+// { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -18,11 +24,6 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
-// { dg-do run }
-// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
-// { dg-options "-finput-charset=ISO8859-1" }
-// { dg-require-iconv "ISO8859-1" }
-
 // 22.2.4.1.1 collate members
 
 #include <locale>
@@ -38,9 +39,9 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/compare/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/compare/wchar_t/3.cc	2003-09-23 22:02:18.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/3.cc	2005-05-17 19:20:49.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-24 Petur Runolfsson <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // cache the collate facets
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc	2005-03-05 02:44:42.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc	2005-05-18 00:35:23.000000000 +0200
@@ -1,6 +1,12 @@
+// { dg-do run }
+// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
+// { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -20,11 +26,6 @@
 
 // 22.2.4.1.1 collate members
 
-// { dg-do run }
-// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
-// { dg-options "-finput-charset=ISO8859-1" }
-// { dg-require-iconv "ISO8859-1" }
-
 #include <testsuite_hooks.h>
 
 #define main discard_main_1
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc	2005-03-05 02:44:42.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc	2005-05-18 00:35:39.000000000 +0200
@@ -1,6 +1,12 @@
+// { dg-do run }
+// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
+// { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -20,11 +26,6 @@
 
 // 22.2.4.1.1 collate members
 
-// { dg-do run }
-// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
-// { dg-options "-finput-charset=ISO8859-1" }
-// { dg-require-iconv "ISO8859-1" }
-
 #include <testsuite_hooks.h>
 
 #define main discard_main_1
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/hash/char/2.cc libstdc++-v3/testsuite/22_locale/collate/hash/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/hash/char/2.cc	2003-09-23 22:02:18.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/hash/char/2.cc	2005-05-17 19:23:06.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,9 +35,9 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/hash/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/hash/char/wrapped_env.cc	2003-07-24 23:07:36.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_env.cc	2005-05-17 19:23:21.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/hash/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/hash/char/wrapped_locale.cc	2003-07-24 23:07:36.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc	2005-05-17 19:23:31.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/hash/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/hash/wchar_t/2.cc	2005-03-05 02:44:43.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc	2005-05-18 00:36:28.000000000 +0200
@@ -1,6 +1,12 @@
+// { dg-do run }
+// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
+// { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -20,11 +26,6 @@
 
 // 22.2.4.1.1 collate members
 
-// { dg-do run }
-// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
-// { dg-options "-finput-charset=ISO8859-1" }
-// { dg-require-iconv "ISO8859-1" }
-
 #include <locale>
 #include <testsuite_hooks.h>
 
@@ -37,9 +38,9 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc	2005-03-05 02:44:43.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc	2005-05-18 00:36:42.000000000 +0200
@@ -1,6 +1,12 @@
+// { dg-do run }
+// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
+// { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -20,11 +26,6 @@
 
 // 22.2.4.1.1 collate members
 
-// { dg-do run }
-// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
-// { dg-options "-finput-charset=ISO8859-1" }
-// { dg-require-iconv "ISO8859-1" }
-
 #include <testsuite_hooks.h>
 
 #define main discard_main_1
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc	2005-03-05 02:44:43.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc	2005-05-18 00:37:02.000000000 +0200
@@ -1,6 +1,12 @@
+// { dg-do run }
+// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
+// { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -20,11 +26,6 @@
 
 // 22.2.4.1.1 collate members
 
-// { dg-do run }
-// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
-// { dg-options "-finput-charset=ISO8859-1" }
-// { dg-require-iconv "ISO8859-1" }
-
 #include <testsuite_hooks.h>
 
 #define main discard_main_1
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/transform/char/2.cc libstdc++-v3/testsuite/22_locale/collate/transform/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/transform/char/2.cc	2003-09-23 22:02:19.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/transform/char/2.cc	2005-05-17 19:24:50.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -32,9 +34,9 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/transform/char/3.cc libstdc++-v3/testsuite/22_locale/collate/transform/char/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/transform/char/3.cc	2003-09-23 22:02:19.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/transform/char/3.cc	2005-05-17 19:25:08.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-24 Petur Runolfsson <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -32,7 +34,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // cache the collate facets
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/transform/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/transform/char/wrapped_env.cc	2003-07-24 23:07:36.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_env.cc	2005-05-17 19:25:20.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/transform/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/transform/char/wrapped_locale.cc	2003-07-24 23:07:36.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc	2005-05-17 19:25:31.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/transform/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/transform/wchar_t/2.cc	2005-03-05 02:44:43.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc	2005-05-18 00:37:33.000000000 +0200
@@ -1,6 +1,12 @@
+// { dg-do run }
+// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
+// { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -20,11 +26,6 @@
 
 // 22.2.4.1.1 collate members
 
-// { dg-do run }
-// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
-// { dg-options "-finput-charset=ISO8859-1" }
-// { dg-require-iconv "ISO8859-1" }
-
 #include <locale>
 #include <testsuite_hooks.h>
 
@@ -37,9 +38,9 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/transform/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/transform/wchar_t/3.cc	2003-09-23 22:02:19.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/3.cc	2005-05-17 19:26:10.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-02-24 Petur Runolfsson <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -32,7 +34,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // cache the collate facets
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc	2005-03-05 02:44:43.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc	2005-05-18 00:37:51.000000000 +0200
@@ -1,6 +1,12 @@
+// { dg-do run }
+// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
+// { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -20,11 +26,6 @@
 
 // 22.2.4.1.1 collate members
 
-// { dg-do run }
-// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
-// { dg-options "-finput-charset=ISO8859-1" }
-// { dg-require-iconv "ISO8859-1" }
-
 #include <testsuite_hooks.h>
 
 #define main discard_main_2
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc	2005-03-05 02:44:43.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc	2005-05-18 00:38:07.000000000 +0200
@@ -1,6 +1,12 @@
+// { dg-do run }
+// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
+// { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -20,11 +26,6 @@
 
 // 22.2.4.1.1 collate members
 
-// { dg-do run }
-// { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */
-// { dg-options "-finput-charset=ISO8859-1" }
-// { dg-require-iconv "ISO8859-1" }
-
 #include <testsuite_hooks.h>
 
 #define main discard_main_2
diff -urN libstdc++-v3-orig/testsuite/22_locale/collate_byname/named_equivalence.cc libstdc++-v3/testsuite/22_locale/collate_byname/named_equivalence.cc
--- libstdc++-v3-orig/testsuite/22_locale/collate_byname/named_equivalence.cc	2003-10-22 20:58:32.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/collate_byname/named_equivalence.cc	2005-05-17 19:27:17.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002 Free Software Foundation
+// Copyright (C) 2001, 2002, 2005 Free Software Foundation
 //
 // 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
@@ -32,7 +34,7 @@
   string str;
   locale loc_c = locale::classic();
 
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   str = loc_de.name();
 
   locale loc_byname(locale::classic(), new collate_byname<char>("de_DE"));
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/cons/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/cons/char/wrapped_env.cc	2003-07-24 23:07:37.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_env.cc	2005-05-17 19:29:39.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc	2003-07-24 23:07:37.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc	2005-05-17 19:29:48.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/is/char/2.cc libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/is/char/2.cc	2005-03-16 12:24:15.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc	2005-05-17 19:30:18.000000000 +0200
@@ -1,3 +1,4 @@
+// { dg-require-namedlocale "" }
 // { dg-do run { xfail *-*-![linux]* } }
 // Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
 // Free Software Foundation, Inc.
@@ -68,7 +69,7 @@
     }   
 
   // "de_DE"
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   const ctype<char>& ctype_de = use_facet<ctype<char> >(loc_de); 
   for (int i = 0; i < max; ++i)
     {
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/is/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/is/char/wrapped_env.cc	2003-07-24 23:07:37.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_env.cc	2005-05-17 19:30:41.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/is/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/is/char/wrapped_locale.cc	2003-07-24 23:07:37.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc	2005-05-17 19:30:51.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/is/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/is/wchar_t/2.cc	2005-03-16 12:24:16.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc	2005-05-17 19:31:17.000000000 +0200
@@ -1,3 +1,4 @@
+// { dg-require-namedlocale "" }
 // { dg-do run { xfail *-*-![linux]* } }
 // Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
 // Free Software Foundation, Inc.
@@ -68,7 +69,7 @@
     }   
 
   // "de_DE"
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   const ctype<wchar_t>& ctype_de = use_facet<ctype<wchar_t> >(loc_de); 
   for (int i = 0; i < max; ++i)
     {
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc	2003-07-24 23:07:38.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc	2005-05-17 19:31:28.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc	2003-07-24 23:07:38.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc	2005-05-17 19:31:38.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/narrow/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/narrow/char/wrapped_env.cc	2003-07-24 23:07:38.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_env.cc	2005-05-17 19:32:03.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc	2003-07-24 23:07:38.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc	2005-05-17 19:33:16.000000000 +0200
@@ -1,3 +1,5 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
 // Copyright (C) 2001, 2002, 2003 Free Software Foundation
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/narrow/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/narrow/wchar_t/3.cc	2003-09-23 22:02:21.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc	2005-05-17 19:34:10.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-03-12  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -38,7 +40,7 @@
   using namespace std;
   bool test __attribute__((unused)) = true;
 
-  locale loc = __gnu_test::try_named_locale("se_NO.UTF-8");
+  locale loc = locale("se_NO.UTF-8");
   const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
 
   const wchar_t* wstrlit = L"\x80";
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc	2003-07-24 23:07:38.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc	2005-05-17 19:34:26.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc	2003-07-24 23:07:38.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc	2005-05-17 19:34:36.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/scan/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/scan/char/wrapped_env.cc	2003-07-24 23:07:39.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_env.cc	2005-05-17 19:35:05.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc	2003-07-24 23:07:39.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc	2005-05-17 19:35:14.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc	2003-07-24 23:07:39.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc	2005-05-17 19:35:27.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc	2003-07-24 23:07:39.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc	2005-05-17 19:35:37.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/to/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/to/char/wrapped_env.cc	2003-07-24 23:07:39.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_env.cc	2005-05-17 19:35:52.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/to/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/to/char/wrapped_locale.cc	2003-07-24 23:07:39.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_locale.cc	2005-05-17 19:36:02.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc	2003-07-24 23:07:40.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc	2005-05-17 19:36:16.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc	2003-07-24 23:07:40.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc	2005-05-17 19:36:26.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/widen/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/widen/char/wrapped_env.cc	2003-07-24 23:07:40.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_env.cc	2005-05-17 19:36:40.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc	2003-07-24 23:07:40.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc	2005-05-17 19:36:51.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/widen/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/widen/wchar_t/2.cc	2003-09-23 22:02:24.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc	2005-05-17 20:05:43.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-03-12  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -38,7 +40,7 @@
   using namespace std;
   bool test __attribute__((unused)) = true;
 
-  locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1");
+  locale loc = locale("en_US.ISO-8859-1");
   const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
 
   char c = 0xff;
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/widen/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/widen/wchar_t/3.cc	2003-09-23 22:02:24.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/3.cc	2005-05-17 20:06:02.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-03-12  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -38,7 +40,7 @@
   using namespace std;
   bool test __attribute__((unused)) = true;
 
-  locale loc = __gnu_test::try_named_locale("se_NO.UTF-8");
+  locale loc = locale("se_NO.UTF-8");
   const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
 
   const char* strlit = "\xc2\x80";
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/widen/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/widen/wchar_t/wrapped_env.cc	2003-07-24 23:07:40.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_env.cc	2005-05-17 19:37:03.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc	2003-07-24 23:07:40.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc	2005-05-17 19:37:13.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/facet/2.cc libstdc++-v3/testsuite/22_locale/facet/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/facet/2.cc	2003-09-23 22:02:24.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/facet/2.cc	2005-05-17 19:38:00.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2000-08-31 Benjamin Kosnik <bkoz@redhat.com>
 
-// Copyright (C) 2000, 2002, 2003 Free Software Foundation
+// Copyright (C) 2000, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -83,7 +85,7 @@
   // 4: Named locale should destroy facets when it goes out of scope.
   // Not quite sure how to test for this w/o valgrind at the moment.
   {
-    locale loc03 = __gnu_test::try_named_locale("es_MX");
+    locale loc03 = locale("es_MX");
   }
 }
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/cons/12352.cc libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/cons/12352.cc	2003-11-14 12:52:46.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc	2005-05-17 22:59:13.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -101,7 +103,7 @@
 	  times_to_fail = i;
 	  try
 	    {
-	      std::locale loc1 = __gnu_test::try_named_locale("");
+	      std::locale loc1 = std::locale("");
 	      std::locale loc2(loc1, std::locale::classic(),
 			       std::locale::numeric);
 	    }
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/cons/12438.cc libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/cons/12438.cc	2003-12-10 10:26:50.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc	2005-05-17 19:40:29.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -42,7 +44,7 @@
       try
 	{
 	  locale loc1 = locale::classic();
-	  locale loc2 = __gnu_test::try_named_locale("");
+	  locale loc2 = locale("");
 	  VERIFY( !has_facet<MyFacet>(loc2) );
 	  
 	  loc1.combine<MyFacet>(loc2);
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/cons/12658_thread-1.cc libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/cons/12658_thread-1.cc	2005-03-10 01:08:38.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc	2005-05-18 00:41:45.000000000 +0200
@@ -1,8 +1,9 @@
 // { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
 // { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* } }
 // { dg-options "-pthreads" { target *-*-solaris* } }
+// { dg-require-namedlocale "" }
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -38,7 +39,7 @@
       std::locale loc_c = std::locale::classic();
       std::locale loc[max_locales];
       for (int j = 0; j < max_locales; ++j)
-	loc[j] = __gnu_test::try_named_locale(j % 2 ? "en_US" : "fr_FR");
+	loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR");
       
       for (int i = 0; i < max_loop_count; ++i)
 	{
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/cons/12658_thread-2.cc libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/cons/12658_thread-2.cc	2004-07-14 16:01:45.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc	2005-05-18 00:42:03.000000000 +0200
@@ -1,8 +1,9 @@
 // { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* } }
 // { dg-options "-pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* } }
 // { dg-options "-pthreads" { target *-*-solaris* } }
+// { dg-require-namedlocale "" }
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -52,7 +53,7 @@
   pthread_t tid[max_thread_count];
   
   for (int j = 0; j < max_locales; ++j)
-    loc[j] = __gnu_test::try_named_locale(j % 2 ? "en_US" : "fr_FR");  
+    loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR");  
 
   for (int i = 0; i < max_thread_count; i++)
     pthread_create(&tid[i], NULL, thread_main, 0);
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/cons/2.cc libstdc++-v3/testsuite/22_locale/locale/cons/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/cons/2.cc	2003-09-23 22:02:25.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/locale/cons/2.cc	2005-05-17 19:41:51.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2000-09-13 Benjamin Kosnik <bkoz@redhat.com>
 
-// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2000, 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -170,7 +172,7 @@
 
   // 3
   // explicit locale(const char* std_name)
-  locale loc06 = __gnu_test::try_named_locale("fr_FR");
+  locale loc06 = locale("fr_FR");
   VERIFY (loc06 != loc01);  
   VERIFY (loc06 != loc02);  
   VERIFY (loc06.name() == "fr_FR");
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/cons/4.cc libstdc++-v3/testsuite/22_locale/locale/cons/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/cons/4.cc	2003-09-23 22:02:25.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/locale/cons/4.cc	2005-05-17 23:00:23.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2000-09-13 Benjamin Kosnik <bkoz@redhat.com>
 
-// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2000, 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   const char* LC_ALL_orig = getenv("LC_ALL");
   if (!setenv("LC_ALL", "it_IT", 1))
     {
-      std::locale loc = __gnu_test::try_named_locale(""); 
+      std::locale loc = std::locale(""); 
       VERIFY( loc.name() == "it_IT" );
       setenv("LC_ALL", LC_ALL_orig ? LC_ALL_orig : "", 1);
     }
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/cons/5.cc libstdc++-v3/testsuite/22_locale/locale/cons/5.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/cons/5.cc	2003-09-23 22:02:25.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/locale/cons/5.cc	2005-05-17 19:43:50.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2000-09-13 Benjamin Kosnik <bkoz@redhat.com>
 
-// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2000, 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -65,7 +67,7 @@
   // Check that a "POSIX" LC_ALL is equivalent to "C".
   if (!setenv("LC_ALL", "POSIX", 1))
     {
-      locale loc = __gnu_test::try_named_locale("");
+      locale loc = locale("");
       VERIFY( loc.name() == "C" );
     }
   setenv("LC_ALL", "", 1);
@@ -73,7 +75,7 @@
   // Check that a "en_PH" LC_ALL is equivalent to "en_PH".
   if (!setenv("LC_ALL", "en_PH", 1))
     {
-      locale loc = __gnu_test::try_named_locale("");
+      locale loc = locale("");
       VERIFY( loc.name() == "en_PH" );
     }
   setenv("LC_ALL", "", 1);
@@ -83,7 +85,7 @@
     {
       if (!setenv("LC_ALL", "en_PH", 1))
 	{
-	  locale loc = __gnu_test::try_named_locale("");
+	  locale loc = locale("");
 	  VERIFY( loc.name() == "en_PH" );
 	}
       setenv("LC_ALL", "", 1);
@@ -112,7 +114,7 @@
   // Check the default set by LANG.
   if (!setenv("LANG", "fr_FR", 1))
     {
-      locale loc = __gnu_test::try_named_locale("");
+      locale loc = locale("");
       VERIFY( loc.name() == "fr_FR" );
     }
 
@@ -126,7 +128,7 @@
   // Setting a category in the "C" default.
   if (!setenv("LC_COLLATE", "de_DE", 1))
     {
-      locale loc = __gnu_test::try_named_locale("");
+      locale loc = locale("");
 
 #if _GLIBCXX_NUM_CATEGORIES
       VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_TIME=C;"
@@ -142,7 +144,7 @@
   // Changing the LANG default while LC_COLLATE is set.
   if (!setenv("LANG", "fr_FR", 1))
     {
-      locale loc = __gnu_test::try_named_locale("");
+      locale loc = locale("");
 #if _GLIBCXX_NUM_CATEGORIES
       VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;"
 	      "LC_TIME=fr_FR;LC_COLLATE=de_DE;LC_MONETARY=fr_FR;"
@@ -160,7 +162,7 @@
 #if _GLIBCXX_NUM_CATEGORIES
   if (!setenv("LC_IDENTIFICATION", "it_IT", 1))
     {
-      locale loc = __gnu_test::try_named_locale("");
+      locale loc = locale("");
       VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;"
 	      "LC_TIME=fr_FR;LC_COLLATE=de_DE;LC_MONETARY=fr_FR;"
 	      "LC_MESSAGES=fr_FR;LC_PAPER=fr_FR;LC_NAME=fr_FR;"
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/cons/7.cc libstdc++-v3/testsuite/22_locale/locale/cons/7.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/cons/7.cc	2003-09-23 22:02:25.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/locale/cons/7.cc	2005-05-17 20:07:00.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-01-19 Benjamin Kosnik <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2003 Free Software Foundation
+// Copyright (C) 2001, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -35,7 +37,7 @@
 
   // construct a locale object with the specialized facet.
   locale		loc_c = locale::classic();
-  locale		loc_fr = __gnu_test::try_named_locale("fr_FR");
+  locale		loc_fr = locale("fr_FR");
   locale 		loc_1(locale::classic(), 
 			      new numpunct_byname<char>("fr_FR"));
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/cons/7222-env.cc libstdc++-v3/testsuite/22_locale/locale/cons/7222-env.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/cons/7222-env.cc	2003-09-23 22:02:25.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/locale/cons/7222-env.cc	2005-05-17 23:00:36.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2000-09-13 Benjamin Kosnik <bkoz@redhat.com>
 
-// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2000, 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -30,8 +32,8 @@
 {
   bool test __attribute__((unused)) = true;
 
-  std::locale loc_1 = __gnu_test::try_named_locale("");
-  std::locale loc_2 = __gnu_test::try_named_locale("");
+  std::locale loc_1 = std::locale("");
+  std::locale loc_2 = std::locale("");
   VERIFY( loc_1 == loc_2 );
 }
  
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/global_locale_objects/14071.cc libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/global_locale_objects/14071.cc	2004-02-10 00:10:47.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc	2005-05-17 19:45:14.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-02-09  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -30,8 +32,8 @@
   using namespace std;
   bool test __attribute__((unused)) = true;
 
-  const locale loc_is = __gnu_test::try_named_locale("is_IS");
-  const locale loc_en = __gnu_test::try_named_locale("en_US");
+  const locale loc_is = locale("is_IS");
+  const locale loc_en = locale("en_US");
 
   const locale loc(loc_is, loc_en, locale::monetary);
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/global_locale_objects/2.cc libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/global_locale_objects/2.cc	2003-09-23 22:02:25.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc	2005-05-17 19:45:57.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2000-09-13 Benjamin Kosnik <bkoz@redhat.com>
 
-// Copyright (C) 2000, 2002, 2003 Free Software Foundation
+// Copyright (C) 2000, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -42,13 +44,13 @@
   // named locales work.
   if (testph && testmx)
     {
-      const locale loc_ph = __gnu_test::try_named_locale(ph.c_str());
-      const locale loc_mx = __gnu_test::try_named_locale(mx.c_str());
+      const locale loc_ph = locale(ph.c_str());
+      const locale loc_mx = locale(mx.c_str());
       
       // Use setlocale between two calls to locale("")
-      const locale loc_env_1 = __gnu_test::try_named_locale("");
+      const locale loc_env_1 = locale("");
       setlocale(LC_ALL, ph.c_str());
-      const locale loc_env_2 = __gnu_test::try_named_locale("");
+      const locale loc_env_2 = locale("");
       VERIFY( loc_env_1 == loc_env_2 );
       
       // Change global locale.
diff -urN libstdc++-v3-orig/testsuite/22_locale/messages/members/char/1.cc libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/messages/members/char/1.cc	2004-04-09 12:18:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc	2005-05-17 19:47:23.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-07-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -35,7 +37,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // cache the messages facets
diff -urN libstdc++-v3-orig/testsuite/22_locale/messages/members/char/2.cc libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/messages/members/char/2.cc	2004-04-09 12:18:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc	2005-05-17 19:47:42.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-07-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -35,7 +37,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
+  locale loc_fr = locale("fr_FR");
   VERIFY( loc_c != loc_fr );
 
   // cache the messages facets
diff -urN libstdc++-v3-orig/testsuite/22_locale/messages/members/char/3.cc libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/messages/members/char/3.cc	2004-04-09 12:18:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc	2005-05-17 19:48:02.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-07-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -35,8 +37,8 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
   VERIFY( loc_c != loc_us );
   VERIFY( loc_us != loc_fr );
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/messages/members/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/messages/members/char/wrapped_env.cc	2003-07-24 23:07:42.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_env.cc	2005-05-17 19:46:51.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/messages/members/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/messages/members/char/wrapped_locale.cc	2003-07-24 23:07:42.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc	2005-05-17 19:47:01.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/messages_byname/named_equivalence.cc libstdc++-v3/testsuite/22_locale/messages_byname/named_equivalence.cc
--- libstdc++-v3-orig/testsuite/22_locale/messages_byname/named_equivalence.cc	2003-10-22 20:58:33.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/messages_byname/named_equivalence.cc	2005-05-17 19:52:15.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-07-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2003 Free Software Foundation
+// Copyright (C) 2001, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -35,7 +37,7 @@
   const char* dir = LOCALEDIR;
   locale loc_c = locale::classic();
 
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   str = loc_de.name();
 
   locale loc_byname(locale::classic(), new messages_byname<char>("de_DE"));
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/1.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/1.cc	2004-05-23 01:46:34.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc	2005-05-17 19:53:06.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/10.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/10.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/10.cc	2003-10-23 19:05:00.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/10.cc	2005-05-17 19:54:31.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-10-23  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -31,7 +33,7 @@
 
   bool test __attribute__((unused)) = true;
 
-  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_us = locale("en_US");
 
   iterator_type end;
   istringstream iss;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/11.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/11.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/11.cc	2003-10-25 00:50:24.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/11.cc	2005-05-17 19:54:47.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-10-24  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   bool test __attribute__((unused)) = true;
   
   // basic construction
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
 
   iterator_type end;
   istringstream iss;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/11528.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/11528.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/11528.cc	2003-09-23 22:02:27.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/11528.cc	2005-05-17 19:55:11.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -29,7 +31,7 @@
 
   bool test __attribute__((unused)) = true;
 
-  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_us = locale("en_US");
 
   iterator_type end;
   istringstream iss;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/12.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/12.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/12.cc	2004-02-05 21:13:37.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/12.cc	2005-05-17 19:55:30.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-02-05  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   // total EPA budget FY 2002
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/13.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/13.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/13.cc	2004-02-05 21:13:37.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/13.cc	2005-05-17 19:55:46.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-02-05  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   iterator_type end01, end02;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/15.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/15.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/15.cc	2004-03-01 11:31:31.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/15.cc	2005-05-17 19:56:13.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-03-01  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -35,7 +37,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   iterator_type end01, end02;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/16.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/16.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/16.cc	2004-03-02 23:25:50.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/16.cc	2005-05-17 19:56:31.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-03-02  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,8 +36,8 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_de = locale("de_DE@euro");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_c != loc_hk );
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/17.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/17.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/17.cc	2004-03-08 11:51:30.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/17.cc	2005-05-17 19:56:48.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-03-08  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -35,7 +37,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   iterator_type end, end02;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/18.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/18.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/18.cc	2004-03-15 10:02:30.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/18.cc	2005-05-17 19:57:03.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-03-15  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -35,7 +37,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
   
   iterator_type end, end01, end02;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/2.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/2.cc	2004-03-06 15:56:56.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc	2005-05-17 19:53:30.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
   // total EPA budget FY 2002
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/3.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/3.cc	2004-03-06 15:56:56.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc	2005-05-17 19:53:47.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   // total EPA budget FY 2002
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/4.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/4.cc	2004-03-06 15:56:56.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc	2005-05-17 19:54:02.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
   // input less than frac_digits
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/wrapped_env.cc	2003-07-24 23:07:42.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_env.cc	2005-05-17 19:57:25.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/char/wrapped_locale.cc	2003-07-24 23:07:42.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc	2005-05-17 19:57:36.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/1.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/1.cc	2004-03-06 15:56:56.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc	2005-05-17 19:57:54.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/10.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/10.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/10.cc	2003-10-23 19:05:01.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/10.cc	2005-05-17 19:58:19.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-10-23  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -31,7 +33,7 @@
 
   bool test __attribute__((unused)) = true;
 
-  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_us = locale("en_US");
 
   iterator_type end;
   wistringstream iss;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/11.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/11.cc	2003-10-25 00:50:24.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11.cc	2005-05-17 19:58:36.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-10-24  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   bool test __attribute__((unused)) = true;
   
   // basic construction
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
 
   iterator_type end;
   wistringstream iss;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/11528.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11528.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/11528.cc	2003-09-23 22:02:28.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11528.cc	2005-05-17 19:58:52.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -29,7 +31,7 @@
 
   bool test __attribute__((unused)) = true;
 
-  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_us = locale("en_US");
 
   iterator_type end;
   wistringstream iss;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/12.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/12.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/12.cc	2004-02-05 21:13:37.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/12.cc	2005-05-17 19:59:10.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-02-05  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   // total EPA budget FY 2002
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/13.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/13.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/13.cc	2004-02-05 21:13:37.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/13.cc	2005-05-17 20:02:29.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-02-05  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   iterator_type end01, end02;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/15.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/15.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/15.cc	2004-03-01 11:31:32.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/15.cc	2005-05-17 19:59:42.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-03-01  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -35,7 +37,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   iterator_type end01, end02;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/16.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/16.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/16.cc	2004-03-02 23:25:51.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/16.cc	2005-05-17 19:59:58.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-03-02  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,8 +36,8 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_de = locale("de_DE@euro");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_c != loc_hk );
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/17.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/17.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/17.cc	2004-03-08 11:51:30.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/17.cc	2005-05-17 20:00:14.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-03-08  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -35,7 +37,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   iterator_type end, end02;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/18.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/18.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/18.cc	2004-03-15 10:02:30.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/18.cc	2005-05-17 20:00:30.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-03-15  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -35,7 +37,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
   
   iterator_type end, end01, end02;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/2.cc	2004-03-06 15:56:56.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc	2005-05-17 20:07:29.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
   // total EPA budget FY 2002
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/3.cc	2004-03-06 15:56:56.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc	2005-05-17 20:07:49.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   // total EPA budget FY 2002
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/4.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/4.cc	2004-03-06 15:56:56.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc	2005-05-17 20:08:05.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-12 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
   // input less than frac_digits
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc	2003-07-24 23:07:43.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc	2005-05-17 20:01:52.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc	2003-07-24 23:07:43.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc	2005-05-17 20:02:05.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/1.cc libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/1.cc	2004-02-21 10:26:34.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc	2005-05-17 20:16:55.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/2.cc libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/2.cc	2004-02-21 10:26:34.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc	2005-05-17 20:17:44.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/3.cc libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/3.cc	2004-02-21 10:26:34.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc	2005-05-17 20:18:01.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/9780-3.cc libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/9780-3.cc	2004-03-24 07:41:06.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc	2005-05-17 20:17:24.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2004, 2005 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
@@ -25,8 +27,8 @@
   using namespace std;
 
   bool test __attribute__((unused)) = true;
-  locale l1 = __gnu_test::try_named_locale("de_DE");
-  locale l2 = __gnu_test::try_named_locale("es_ES");
+  locale l1 = locale("de_DE");
+  locale l2 = locale("es_ES");
   
   const money_put<char>& mp = use_facet<money_put<char> >(l1);  
   ostringstream oss;
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/wrapped_env.cc	2003-07-24 23:07:43.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc	2005-05-17 20:18:23.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_put/put/char/wrapped_locale.cc	2003-07-24 23:07:43.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc	2005-05-17 20:18:33.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_put/put/wchar_t/1.cc libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_put/put/wchar_t/1.cc	2004-08-21 13:56:46.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc	2005-05-17 20:18:51.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_put/put/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_put/put/wchar_t/2.cc	2004-08-21 13:56:46.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc	2005-05-17 20:19:07.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_put/put/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_put/put/wchar_t/3.cc	2004-08-21 13:56:46.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc	2005-05-17 20:19:38.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE@euro");
+  locale loc_de = locale("de_DE@euro");
   VERIFY( loc_c != loc_de );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc	2003-07-24 23:07:43.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc	2005-05-17 20:19:54.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc	2003-07-24 23:07:43.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc	2005-05-17 20:20:04.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/char/2.cc libstdc++-v3/testsuite/22_locale/moneypunct/members/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/char/2.cc	2003-09-23 22:02:29.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/moneypunct/members/char/2.cc	2005-05-17 20:21:02.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-23 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
 
   // cache the moneypunct facets
   typedef moneypunct<char, true> __money_true;
diff -urN libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/char/wrapped_env.cc	2003-07-24 23:07:44.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_env.cc	2005-05-17 20:20:29.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc	2003-07-24 23:07:44.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc	2005-05-17 20:20:39.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/wchar_t/2.cc	2003-09-23 22:02:29.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/2.cc	2005-05-17 20:21:21.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-23 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
 
   // cache the moneypunct facets
   typedef moneypunct<wchar_t, true> __money_true;
diff -urN libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_env.cc	2003-07-24 23:07:44.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_env.cc	2005-05-17 20:21:32.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc	2003-07-24 23:07:44.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc	2005-05-17 20:21:41.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/moneypunct_byname/named_equivalence.cc libstdc++-v3/testsuite/22_locale/moneypunct_byname/named_equivalence.cc
--- libstdc++-v3-orig/testsuite/22_locale/moneypunct_byname/named_equivalence.cc	2003-10-22 20:58:34.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/moneypunct_byname/named_equivalence.cc	2005-05-17 20:22:09.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-24 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2003 Free Software Foundation
+// Copyright (C) 2001, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -32,7 +34,7 @@
   bool test __attribute__((unused)) = true;
   string str;
 
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   str = loc_de.name();
 
   locale loc_byname(locale::classic(), new moneypunct_byname<char>("de_DE"));
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/1.cc libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/1.cc	2004-04-09 12:18:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc	2005-05-17 20:23:10.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/3.cc libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/3.cc	2004-04-09 12:18:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc	2005-05-17 20:23:33.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/5.cc libstdc++-v3/testsuite/22_locale/num_get/get/char/5.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/5.cc	2003-09-23 22:02:30.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/5.cc	2005-05-17 20:23:52.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -36,7 +38,7 @@
   istringstream iss;
 
   // A locale that expects grouping  
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   iss.imbue(loc_de);
 
   const num_get<char>& ng = use_facet<num_get<char> >(iss.getloc()); 
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/6.cc libstdc++-v3/testsuite/22_locale/num_get/get/char/6.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/6.cc	2003-09-23 22:02:30.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/6.cc	2005-05-17 20:24:06.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   double d = 0.0;
 
   istringstream iss;
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   iss.imbue(loc_de);
 
   const num_get<char>& ng = use_facet<num_get<char> >(iss.getloc()); 
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/9.cc libstdc++-v3/testsuite/22_locale/num_get/get/char/9.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/9.cc	2003-12-19 10:35:22.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/9.cc	2005-05-17 20:24:21.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-12-19  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -32,7 +34,7 @@
   bool test __attribute__((unused)) = true;
 
   // A locale that expects grouping  
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   istringstream iss;
   iss.imbue(loc_de);
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/wrapped_env.cc	2003-07-24 23:07:45.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_env.cc	2005-05-17 20:22:41.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/char/wrapped_locale.cc	2003-07-24 23:07:45.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc	2005-05-17 20:22:55.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/1.cc libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/1.cc	2004-04-09 12:18:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc	2005-05-17 20:24:35.000000000 +0200
@@ -1,3 +1,5 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
 
 // Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
@@ -33,7 +35,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/3.cc	2004-04-09 12:18:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc	2005-05-17 20:24:51.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/5.cc libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/5.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/5.cc	2003-09-23 22:02:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/5.cc	2005-05-17 20:25:06.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -36,7 +38,7 @@
   wistringstream iss;
 
   // A locale that expects grouping  
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   iss.imbue(loc_de);
 
   const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/6.cc libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/6.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/6.cc	2003-09-23 22:02:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/6.cc	2005-05-17 20:25:33.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   double d = 0.0;
 
   wistringstream iss;
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   iss.imbue(loc_de);
 
   const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/9.cc libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/9.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/9.cc	2003-12-19 10:35:23.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/9.cc	2005-05-17 20:25:48.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-12-19  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -32,7 +34,7 @@
   bool test __attribute__((unused)) = true;
 
   // A locale that expects grouping  
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   wistringstream iss;
   iss.imbue(loc_de);
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc	2003-07-24 23:07:45.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc	2005-05-17 20:25:59.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc	2003-07-24 23:07:45.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc	2005-05-17 20:26:09.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/1.cc libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/1.cc	2004-04-09 12:18:32.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc	2005-05-17 22:53:50.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-19 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de  = __gnu_test::try_named_locale("de_DE");
+  locale loc_de  = locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // cache the numpunct facets
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/20909.cc libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/20909.cc	2005-04-09 02:08:58.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc	2005-05-17 20:32:53.000000000 +0200
@@ -1,3 +1,5 @@
+// { dg-require-namedlocale "" }
+
 // 2005-04-08  Paolo Carlini  <pcarlini@suse.de>
 
 // Copyright (C) 2005 Free Software Foundation
@@ -31,7 +33,7 @@
   bool test __attribute__((unused)) = true;
 
   // A locale that expects grouping.
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
 
   const string empty;
   string result;
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/20914.cc libstdc++-v3/testsuite/22_locale/num_put/put/char/20914.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/20914.cc	2005-04-17 16:30:37.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/20914.cc	2005-05-17 20:33:11.000000000 +0200
@@ -1,3 +1,5 @@
+// { dg-require-namedlocale "" }
+
 // 2005-04-17  Paolo Carlini  <pcarlini@suse.de>
 
 // Copyright (C) 2005 Free Software Foundation
@@ -31,7 +33,7 @@
   bool test __attribute__((unused)) = true;
 
   // A locale that expects grouping.
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
 
   const string empty;
   string result;
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/3.cc libstdc++-v3/testsuite/22_locale/num_put/put/char/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/3.cc	2004-04-09 12:18:32.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/3.cc	2005-05-17 20:33:33.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-19 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/5.cc libstdc++-v3/testsuite/22_locale/num_put/put/char/5.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/5.cc	2003-09-23 22:02:31.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/5.cc	2005-05-17 20:33:52.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-19 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   bool test __attribute__((unused)) = true;
 
   // A locale that expects grouping.
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
 
   const string empty;
   string result;
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/9780-2.cc libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/9780-2.cc	2004-03-24 07:41:07.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc	2005-05-17 20:34:11.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2004, 2005 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
@@ -25,8 +27,8 @@
   using namespace std;
 
   bool test __attribute__((unused)) = true;
-  locale l1 = __gnu_test::try_named_locale("de_DE");
-  locale l2 = __gnu_test::try_named_locale("es_ES");
+  locale l1 = locale("de_DE");
+  locale l2 = locale("es_ES");
   
   const num_put<char>& np = use_facet<num_put<char> >(l1);  
   ostringstream oss;
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/wrapped_env.cc	2003-07-24 23:07:46.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_env.cc	2005-05-17 20:32:27.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/char/wrapped_locale.cc	2003-07-24 23:07:46.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc	2005-05-17 20:32:38.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/1.cc libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/1.cc	2004-05-22 11:02:55.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc	2005-05-17 20:34:35.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-19 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
 
   // cache the numpunct facets
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/20909.cc libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/20909.cc	2005-04-09 02:08:58.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc	2005-05-17 20:35:21.000000000 +0200
@@ -1,3 +1,5 @@
+// { dg-require-namedlocale "" }
+
 // 2005-04-08  Paolo Carlini  <pcarlini@suse.de>
 
 // Copyright (C) 2005 Free Software Foundation
@@ -31,7 +33,7 @@
   bool test __attribute__((unused)) = true;
 
   // A locale that expects grouping.
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
 
   const wstring empty;
   wstring result;
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/20914.cc libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20914.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/20914.cc	2005-04-17 16:30:37.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20914.cc	2005-05-17 20:35:34.000000000 +0200
@@ -1,3 +1,5 @@
+// { dg-require-namedlocale "" }
+
 // 2005-04-17  Paolo Carlini  <pcarlini@suse.de>
 
 // Copyright (C) 2005 Free Software Foundation
@@ -31,7 +33,7 @@
   bool test __attribute__((unused)) = true;
 
   // A locale that expects grouping.
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
 
   const wstring empty;
   wstring result;
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/3.cc	2004-05-22 11:02:56.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/3.cc	2005-05-17 20:34:54.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-19 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_c != loc_hk );
 
   // sanity check the data is correct.
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/5.cc libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/5.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/5.cc	2004-05-22 11:02:56.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/5.cc	2005-05-17 20:35:08.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-11-19 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   bool test __attribute__((unused)) = true;
 
   // A locale that expects grouping.
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
 
   const wstring empty;
   wstring result;
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc	2003-07-24 23:07:46.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc	2005-05-17 20:35:46.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc	2003-07-24 23:07:46.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc	2005-05-17 20:35:56.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/numpunct/members/char/2.cc libstdc++-v3/testsuite/22_locale/numpunct/members/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/numpunct/members/char/2.cc	2003-09-23 22:02:32.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/numpunct/members/char/2.cc	2005-05-17 22:11:45.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-01-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -31,9 +33,9 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
diff -urN libstdc++-v3-orig/testsuite/22_locale/numpunct/members/char/3.cc libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/numpunct/members/char/3.cc	2003-10-22 20:58:34.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc	2005-05-17 22:12:02.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-01-24 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2003 Free Software Foundation
+// Copyright (C) 2001, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -29,7 +31,7 @@
   
   bool test __attribute__((unused)) = true;
 
-  locale loc_it = __gnu_test::try_named_locale("it_IT");
+  locale loc_it = locale("it_IT");
 
   const numpunct<char>& nump_it = use_facet<numpunct<char> >(loc_it); 
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/numpunct/members/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/numpunct/members/char/wrapped_env.cc	2003-07-24 23:07:46.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_env.cc	2005-05-17 22:12:25.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc	2003-07-24 23:07:46.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc	2005-05-17 22:12:37.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/numpunct/members/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/numpunct/members/wchar_t/2.cc	2003-09-23 22:02:33.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc	2005-05-17 22:13:00.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-01-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -31,9 +33,9 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_us = __gnu_test::try_named_locale("en_US");
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_us = locale("en_US");
+  locale loc_fr = locale("fr_FR");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_c != loc_de );
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
diff -urN libstdc++-v3-orig/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc	2003-07-24 23:07:47.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc	2005-05-17 22:13:11.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc	2003-07-24 23:07:47.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc	2005-05-17 22:13:22.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/numpunct_byname/named_equivalence.cc libstdc++-v3/testsuite/22_locale/numpunct_byname/named_equivalence.cc
--- libstdc++-v3-orig/testsuite/22_locale/numpunct_byname/named_equivalence.cc	2003-10-22 20:58:35.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/numpunct_byname/named_equivalence.cc	2005-05-17 22:13:50.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-01-24 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2003 Free Software Foundation
+// Copyright (C) 2001, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -30,7 +32,7 @@
   bool test __attribute__((unused)) = true;
   string str;
 
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   str = loc_de.name();
 
   locale loc_byname(locale::classic(), new numpunct_byname<char>("de_DE"));
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc	2003-07-24 23:07:47.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc	2005-05-17 22:14:30.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc	2003-07-24 23:07:47.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc	2005-05-17 22:14:40.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc	2003-07-24 23:07:47.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc	2005-05-17 22:14:53.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc	2003-07-24 23:07:47.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc	2005-05-17 22:15:02.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/char/12750.cc libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/char/12750.cc	2003-10-27 17:21:13.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc	2005-05-17 22:15:34.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-10-27 Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   bool test __attribute__((unused)) = true;
 
   // basic construction
-  locale loc_is = __gnu_test::try_named_locale("is_IS");
+  locale loc_is = locale("is_IS");
 
   // create an ostream-derived object, cache the time_get facet
   iterator_type end;
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/char/2.cc libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/char/2.cc	2004-04-08 01:13:37.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc	2005-05-17 22:15:52.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,8 +35,8 @@
 
   // basic construction and sanity checks.
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_hk = locale("en_HK");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_hk != loc_c );
   VERIFY( loc_hk != loc_de );
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc	2003-07-24 23:07:48.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc	2005-05-17 22:16:45.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc	2003-07-24 23:07:48.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc	2005-05-17 22:16:55.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc	2003-10-27 17:21:13.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc	2005-05-17 22:17:22.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-10-27 Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
   bool test __attribute__((unused)) = true;
 
   // basic construction
-  locale loc_is = __gnu_test::try_named_locale("is_IS");
+  locale loc_is = locale("is_IS");
 
   // create an ostream-derived object, cache the time_get facet
   iterator_type end;
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/wchar_t/2.cc	2004-04-08 01:13:38.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc	2005-05-17 22:17:44.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,8 +35,8 @@
 
   // basic construction and sanity checks.
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_hk = locale("en_HK");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_hk != loc_c );
   VERIFY( loc_hk != loc_de );
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/wchar_t/4.cc libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/wchar_t/4.cc	2003-12-17 23:14:09.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc	2005-05-17 22:17:56.000000000 +0200
@@ -1,3 +1,5 @@
+// { dg-require-namedlocale "" }
+
 // 2003-12-17  Paolo Carlini  <pcarlini@suse.de>
 
 // Copyright (C) 2003 Free Software Foundation
@@ -31,7 +33,7 @@
 
   typedef istreambuf_iterator<wchar_t> iterator_type;
 
-  locale loc_tw = __gnu_test::try_named_locale("zh_TW");
+  locale loc_tw = locale("zh_TW");
 
   iterator_type end;
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc	2003-07-24 23:07:48.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc	2005-05-17 22:18:10.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc	2003-07-24 23:07:48.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc	2005-05-17 22:18:20.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/char/2.cc libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/char/2.cc	2004-04-08 01:13:39.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc	2005-05-17 22:18:50.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,8 +35,8 @@
 
   // basic construction and sanity checks.
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_hk = locale("en_HK");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_hk != loc_c );
   VERIFY( loc_hk != loc_de );
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc	2003-07-24 23:07:49.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc	2005-05-17 22:19:02.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc	2003-07-24 23:07:49.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc	2005-05-17 22:19:12.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc	2004-04-08 01:13:41.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc	2005-05-17 22:19:37.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,8 +35,8 @@
 
   // basic construction and sanity checks.
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_hk = locale("en_HK");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_hk != loc_c );
   VERIFY( loc_hk != loc_de );
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc	2003-07-24 23:07:49.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc	2005-05-17 22:19:48.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc	2003-07-24 23:07:49.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc	2005-05-17 22:19:58.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/char/1.cc libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/char/1.cc	2004-11-19 22:48:20.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc	2005-05-17 22:20:36.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction and sanity checks.
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_de != loc_c );
 
   const string empty;
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/char/2.cc libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/char/2.cc	2004-04-08 01:13:44.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc	2005-05-17 22:20:55.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_hk != loc_c );
 
   const string empty;
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc	2003-07-24 23:07:50.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc	2005-05-17 22:21:05.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc	2003-07-24 23:07:50.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc	2005-05-17 22:21:17.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/wchar_t/1.cc libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/wchar_t/1.cc	2004-11-19 22:48:20.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc	2005-05-17 22:21:35.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction and sanity checks.
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_de != loc_c );
 
   const wstring empty;
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/wchar_t/2.cc	2004-04-08 01:13:46.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc	2005-05-17 22:21:51.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,7 +35,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_hk != loc_c );
 
   const wstring empty;
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc	2003-07-24 23:07:50.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc	2005-05-17 22:22:03.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc	2003-07-24 23:07:50.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc	2005-05-17 22:22:12.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/char/2.cc libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/char/2.cc	2004-04-08 01:13:48.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc	2005-05-17 22:22:42.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -33,8 +35,8 @@
 
   // basic construction and sanity checks.
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_hk = locale("en_HK");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_hk != loc_c );
   VERIFY( loc_hk != loc_de );
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc	2003-07-24 23:07:50.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc	2005-05-17 22:22:54.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc	2003-07-24 23:07:50.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc	2005-05-17 22:23:04.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc	2004-04-08 01:13:51.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc	2005-05-17 22:23:22.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
@@ -33,8 +35,8 @@
 
   // basic construction and sanity checks.
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_hk = locale("en_HK");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_hk != loc_c );
   VERIFY( loc_hk != loc_de );
 
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc	2003-07-24 23:07:51.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc	2005-05-17 22:23:34.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc	2003-07-24 23:07:51.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc	2005-05-17 22:23:46.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/17038.cc libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/17038.cc	2004-11-27 10:34:05.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc	2005-05-17 22:25:56.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-08-25  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -37,7 +39,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_in = __gnu_test::try_named_locale("ta_IN");
+  locale loc_in = locale("ta_IN");
   VERIFY( loc_in != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/2.cc libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/2.cc	2004-08-19 12:30:03.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc	2005-05-17 22:26:26.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -36,7 +38,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_de != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/3.cc libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/3.cc	2004-08-19 22:47:39.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc	2005-05-17 22:26:40.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -36,7 +38,7 @@
 
   // basic construction and sanity check.
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_hk != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/4.cc libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/4.cc	2004-08-19 12:30:03.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc	2005-05-17 22:26:55.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -36,7 +38,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro");
+  locale loc_fr = locale("fr_FR@euro");
   VERIFY( loc_fr != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/6.cc libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/6.cc	2004-04-08 01:14:04.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc	2005-05-17 22:27:23.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -39,7 +41,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_de != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/7.cc libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/7.cc	2004-04-08 01:14:04.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc	2005-05-17 22:27:41.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -39,7 +41,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_hk != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/8.cc libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/8.cc	2004-04-08 01:14:04.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc	2005-05-17 22:27:56.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -39,7 +41,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro");
+  locale loc_fr = locale("fr_FR@euro");
   VERIFY( loc_fr != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/9780-1.cc libstdc++-v3/testsuite/22_locale/time_put/put/char/9780-1.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/9780-1.cc	2004-04-08 01:14:04.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/9780-1.cc	2005-05-17 22:28:51.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2004, 2005 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
@@ -25,8 +27,8 @@
   using namespace std;
 
   bool test __attribute__((unused)) = true;
-  locale l1 = __gnu_test::try_named_locale("de_DE");
-  locale l2 = __gnu_test::try_named_locale("es_ES");
+  locale l1 = locale("de_DE");
+  locale l2 = locale("es_ES");
   
   const time_put<char> &tp = use_facet<time_put<char> >(l1);  
   ostringstream oss;
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/wrapped_env.cc	2003-07-24 23:07:52.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_env.cc	2005-05-17 22:29:16.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/char/wrapped_locale.cc	2003-07-24 23:07:52.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc	2005-05-17 22:29:26.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/17038.cc libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/17038.cc	2004-11-27 10:34:05.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc	2005-05-17 22:29:50.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-08-25  Paolo Carlini  <pcarlini@suse.de>
 
-// Copyright (C) 2004 Free Software Foundation
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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
@@ -37,7 +39,7 @@
 
   // basic construction
   locale loc_c = locale::classic();
-  locale loc_in = __gnu_test::try_named_locale("ta_IN");
+  locale loc_in = locale("ta_IN");
   VERIFY( loc_in != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/2.cc libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/2.cc	2004-08-19 12:30:04.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc	2005-05-17 22:30:05.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -36,7 +38,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_de != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/3.cc libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/3.cc	2004-08-19 22:47:39.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc	2005-05-17 22:30:19.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -36,7 +38,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_hk != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/4.cc libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/4.cc	2004-08-19 12:30:05.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc	2005-05-17 22:30:33.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -36,7 +38,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro");
+  locale loc_fr = locale("fr_FR@euro");
   VERIFY( loc_fr != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/6.cc libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/6.cc	2004-08-15 21:03:44.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc	2005-05-17 22:30:49.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -39,7 +41,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   VERIFY( loc_de != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/7.cc libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/7.cc	2004-08-15 21:03:44.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc	2005-05-17 22:31:03.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -39,7 +41,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_hk = __gnu_test::try_named_locale("en_HK");
+  locale loc_hk = locale("en_HK");
   VERIFY( loc_hk != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/8.cc libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/8.cc	2004-08-15 21:03:44.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc	2005-05-17 22:31:18.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-09-17 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 //
 // 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
@@ -39,7 +41,7 @@
 
   // basic construction and sanity check
   locale loc_c = locale::classic();
-  locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro");
+  locale loc_fr = locale("fr_FR@euro");
   VERIFY( loc_fr != loc_c );
 
   // create an ostream-derived object, cache the time_put facet
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc	2003-07-24 23:07:52.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc	2005-05-17 22:31:32.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc
--- libstdc++-v3-orig/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc	2003-07-24 23:07:52.000000000 +0200
+++ libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc	2005-05-17 22:31:42.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation
 //
 // 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
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/13007.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13007.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/13007.cc	2003-11-14 00:13:21.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13007.cc	2005-05-17 23:16:13.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -45,7 +47,7 @@
   bool test __attribute__((unused)) = true;
 
   Buf buf;
-  std::locale loc(__gnu_test::try_named_locale("fr_FR"));
+  std::locale loc(std::locale("fr_FR"));
 
   buf.pubimbue(loc);
 
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc	2003-11-26 16:56:39.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc	2005-05-17 22:34:53.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -30,8 +32,8 @@
 
   filebuf fb;
   
-  fb.pubimbue(__gnu_test::try_named_locale("en_US"));
-  fb.pubimbue(__gnu_test::try_named_locale("en_US"));
+  fb.pubimbue(locale("en_US"));
+  fb.pubimbue(locale("en_US"));
   
   fb.open("tmp_13171-1", ios_base::out);
   fb.sputc('F');
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc	2005-05-06 19:03:07.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc	2005-05-17 22:35:11.000000000 +0200
@@ -1,3 +1,4 @@
+// { dg-require-namedlocale "" }
 // { dg-require-fork "" }
 // { dg-require-mkfifo "" }
 
@@ -36,8 +37,8 @@
   using namespace std;
   using namespace __gnu_test;
 
-  locale loc_fr(__gnu_test::try_named_locale("fr_FR"));
-  locale loc_en(__gnu_test::try_named_locale("en_US"));
+  locale loc_fr(locale("fr_FR"));
+  locale loc_en(locale("en_US"));
 
   const char* name = "tmp_fifo_13171-2";
   unlink(name);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc	2004-04-19 21:00:00.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc	2005-05-17 22:35:42.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -39,10 +41,9 @@
   using namespace std;
 
   filebuf fb;
-  fb.pubimbue(locale(__gnu_test::try_named_locale("en_US"),
-		     new Cvt));
+  fb.pubimbue(locale(locale("en_US"), new Cvt));
   fb.open("tmp_13171-4", ios_base::out);
-  fb.pubimbue(__gnu_test::try_named_locale("fr_FR"));
+  fb.pubimbue(locale("fr_FR"));
   fb.sputc('N');
   fb.pubsync();
   fb.close();
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc	2005-05-06 19:03:07.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc	2005-05-17 22:36:02.000000000 +0200
@@ -1,3 +1,4 @@
+// { dg-require-namedlocale "" }
 // { dg-require-fork "" }
 // { dg-require-mkfifo "" }
 
@@ -39,8 +40,8 @@
   using namespace std; 
   using namespace __gnu_test;
 
-  locale loc_en(__gnu_test::try_named_locale("en_US"));
-  locale loc_fr(__gnu_test::try_named_locale("fr_FR"));
+  locale loc_en(locale("en_US"));
+  locale loc_fr(locale("fr_FR"));
 
   const char* name = "tmp_fifo_13582-2";
   unlink(name);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc	2004-04-16 18:06:21.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc	2005-05-17 22:36:21.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-04-16  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 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
@@ -42,7 +44,7 @@
   bool test __attribute__((unused)) = true;
 
   Buf fb;
-  locale loc_us = __gnu_test::try_named_locale("en_US");
+  locale loc_us = locale("en_US");
   fb.pubimbue(loc_us);
   fb.open("tmp_14975-1", ios_base::out);
   
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/2.cc	2003-11-26 16:56:39.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc	2005-05-17 22:36:40.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-05-13 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -42,7 +44,7 @@
   VERIFY( p != bad);
 
   // According to 27.5.2.2.1, loc == getloc() after pubimbue(loc).
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   locale ret = ob.pubimbue(loc_de);
   VERIFY( ob.getloc() == loc_de );
 }
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/9322.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/char/9322.cc	2003-09-23 22:02:54.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc	2005-05-17 22:37:08.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2005 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
@@ -34,10 +36,10 @@
   std::filebuf ob;
   VERIFY( ob.getloc() == loc );
 
-  locale::global(__gnu_test::try_named_locale("en_US"));
+  locale::global(locale("en_US"));
   VERIFY( ob.getloc() == loc );
 
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   locale ret = ob.pubimbue(loc_de);
   VERIFY( ob.getloc() == loc_de );
   VERIFY( ret == loc );
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/12868.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/12868.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/12868.cc	2003-11-26 16:56:40.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/12868.cc	2005-05-17 22:37:48.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -30,7 +32,7 @@
   using namespace std;
   bool test __attribute__((unused)) = true;
 
-  locale loc_is(__gnu_test::try_named_locale("is_IS.UTF-8"));
+  locale loc_is(locale("is_IS.UTF-8"));
   
   {
     wofstream out("tmp_12868");
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc	2003-11-14 00:13:21.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc	2005-05-17 23:16:26.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -45,7 +47,7 @@
   bool test __attribute__((unused)) = true;
 
   Buf buf;
-  std::locale loc(__gnu_test::try_named_locale("fr_FR"));
+  std::locale loc(std::locale("fr_FR"));
 
   buf.pubimbue(loc);
 
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc	2003-11-28 11:24:27.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc	2005-05-17 22:38:50.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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,19 +30,19 @@
   bool test __attribute__((unused)) = true;
   using namespace std;
 
-  locale::global(__gnu_test::try_named_locale("fr_FR"));
+  locale::global(locale("fr_FR"));
 
   ios_base::sync_with_stdio(false);
 
-  locale::global(__gnu_test::try_named_locale("en_US"));
-  cin.imbue(__gnu_test::try_named_locale("en_US"));
-  cout.imbue(__gnu_test::try_named_locale("en_US"));
-  cerr.imbue(__gnu_test::try_named_locale("en_US"));
-  clog.imbue(__gnu_test::try_named_locale("de_DE"));
-  wcin.imbue(__gnu_test::try_named_locale("en_US"));
-  wcout.imbue(__gnu_test::try_named_locale("en_US"));
-  wcerr.imbue(__gnu_test::try_named_locale("en_US"));
-  wclog.imbue(__gnu_test::try_named_locale("de_DE"));
+  locale::global(locale("en_US"));
+  cin.imbue(locale("en_US"));
+  cout.imbue(locale("en_US"));
+  cerr.imbue(locale("en_US"));
+  clog.imbue(locale("de_DE"));
+  wcin.imbue(locale("en_US"));
+  wcout.imbue(locale("en_US"));
+  wcerr.imbue(locale("en_US"));
+  wclog.imbue(locale("de_DE"));
  
   cout << 'f' << endl;
   cerr << 'r' << endl;
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc	2005-05-06 19:03:08.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc	2005-05-17 22:39:11.000000000 +0200
@@ -1,9 +1,10 @@
+// { dg-require-namedlocale "" }
 // { dg-require-fork "" }
 // { dg-require-mkfifo "" }
 
 // 2004-01-11  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 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
@@ -39,8 +40,8 @@
   using namespace std;
   using namespace __gnu_test;
 
-  locale loc_en(__gnu_test::try_named_locale("en_US"));
-  locale loc_fr(__gnu_test::try_named_locale("fr_FR"));
+  locale loc_en(locale("en_US"));
+  locale loc_fr(locale("fr_FR"));
 
   const char* name = "tmp_fifo_13582-2";
   unlink(name);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc	2004-04-19 21:00:00.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc	2005-05-17 22:39:35.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2004-01-11  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 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
@@ -30,8 +32,8 @@
   bool test __attribute__((unused)) = true;
   using namespace std;
 
-  locale loc_en(__gnu_test::try_named_locale("en_US"));
-  locale loc_fr(__gnu_test::try_named_locale("fr_FR"));
+  locale loc_en(locale("en_US"));
+  locale loc_fr(locale("fr_FR"));
 
   const char* name = "tmp_13582-3.tst";
 
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc	2005-05-06 19:03:08.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc	2005-05-17 22:39:51.000000000 +0200
@@ -1,3 +1,4 @@
+// { dg-require-namedlocale "" }
 // { dg-require-fork "" }
 // { dg-require-mkfifo "" }
 
@@ -37,7 +38,7 @@
   using namespace __gnu_test;
   bool test __attribute__((unused)) = true;
 
-  locale loc_us = try_named_locale("en_US");
+  locale loc_us = locale("en_US");
 
   const char* name = "tmp_14975-2";
 
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc	2003-11-26 16:56:40.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc	2005-05-17 22:40:28.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-05-13 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -42,7 +44,7 @@
   VERIFY( p != bad);
 
   // According to 27.5.2.2.1, p1, loc == getloc() after pubimbue(loc).
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   locale ret = ob.pubimbue(loc_de);
   VERIFY( ob.getloc() == loc_de );
 }
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc	2003-09-23 22:02:54.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc	2005-05-17 22:40:51.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2005 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
@@ -34,10 +36,10 @@
   std::wfilebuf ob;
   VERIFY( ob.getloc() == loc );
 
-  locale::global(__gnu_test::try_named_locale("en_US"));
+  locale::global(locale("en_US"));
   VERIFY( ob.getloc() == loc );
 
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   locale ret = ob.pubimbue(loc_de);
   VERIFY( ob.getloc() == loc_de );
   VERIFY( ret == loc );
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc	2003-11-13 15:19:39.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc	2005-05-17 22:43:05.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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,7 +30,7 @@
   bool test __attribute__((unused)) = true;
 
   wfilebuf fb;
-  locale loc(__gnu_test::try_named_locale("en_US.UTF-8"));
+  locale loc(locale("en_US.UTF-8"));
   fb.pubimbue(loc);
   fb.pubsetbuf(0, 0);
   fb.open("tmp_11305-1", ios_base::out);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc	2003-11-13 15:19:39.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc	2005-05-17 22:43:19.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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,7 +30,7 @@
   bool test __attribute__((unused)) = true;
 
   wfilebuf fb;
-  locale loc(__gnu_test::try_named_locale("en_US.UTF-8"));
+  locale loc(locale("en_US.UTF-8"));
   fb.pubimbue(loc);
   fb.pubsetbuf(0, 0);
   fb.open("tmp_11305-2", ios_base::out);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc	2003-11-13 15:19:39.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc	2005-05-17 22:43:35.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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,7 +30,7 @@
   bool test __attribute__((unused)) = true;
 
   wfilebuf fb;
-  locale loc(__gnu_test::try_named_locale("en_US.UTF-8"));
+  locale loc(locale("en_US.UTF-8"));
   fb.pubimbue(loc);
   fb.open("tmp_11305-3", ios_base::out);
   wfilebuf::int_type n1 = fb.sputc(0x20000000);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc	2003-11-13 15:19:39.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc	2005-05-17 22:43:50.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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,7 +30,7 @@
   bool test __attribute__((unused)) = true;
 
   wfilebuf fb;
-  locale loc(__gnu_test::try_named_locale("en_US.UTF-8"));
+  locale loc(locale("en_US.UTF-8"));
   fb.pubimbue(loc);
   fb.open("tmp_11405-4", ios_base::out);
   wfilebuf::int_type n1 = fb.sputc(0x20000000);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc	2003-09-23 22:02:57.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/1.cc	2005-05-17 22:44:31.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-09-08  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -90,7 +92,7 @@
   const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
 
   const int loops = 2 * BUFSIZ / wlen;
-  locale loc = __gnu_test::try_named_locale("se_NO.UTF-8");
+  locale loc = locale("se_NO.UTF-8");
 
   FILE* file = fopen(name, "w");
   for (int i = 0; i < loops; ++i)
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc	2003-09-23 22:02:57.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/2.cc	2005-05-17 22:44:49.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-09-08  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -34,7 +36,7 @@
   bool test __attribute__((unused)) = true;
   const char name[] = "tmp_seekoff-2.tst";
 
-  locale loc = __gnu_test::try_named_locale("se_NO.UTF-8");
+  locale loc = locale("se_NO.UTF-8");
 
   const size_t size = 10;
   wchar_t buf[size];
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc	2005-03-16 12:24:34.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/9874.cc	2005-05-17 22:45:23.000000000 +0200
@@ -1,3 +1,5 @@
+// { dg-require-namedlocale "" }
+
 // 2003-10-07  Petur Runolfsson  <peturr02@ru.is>
 //
 // Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -92,7 +94,7 @@
   const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
 
   const int loops = 2 * BUFSIZ / wlen;
-  locale loc = __gnu_test::try_named_locale("se_NO.UTF-8");
+  locale loc = locale("se_NO.UTF-8");
 
   FILE* file = fopen(name, "w");
   for (int i = 0; i < loops; ++i)
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc	2003-09-23 22:03:02.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/1.cc	2005-05-17 22:46:09.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -85,7 +87,7 @@
   const size_t clen = sizeof(cstr) / sizeof(cstr[0]);
   const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
 
-  locale loc = __gnu_test::try_named_locale("se_NO.UTF-8");
+  locale loc = locale("se_NO.UTF-8");
 
   FILE* file = fopen(name, "w");
   fwrite(cstr, 1, clen, file);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc	2003-09-23 22:03:02.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc	2005-05-17 22:46:26.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -34,7 +36,7 @@
   fbout.close();
   
   wfilebuf fbin;
-  locale loc(__gnu_test::try_named_locale("en_US.UTF-8"));
+  locale loc(locale("en_US.UTF-8"));
   fbin.pubimbue(loc);
   fbin.open(name_01, ios_base::in);
   VERIFY( fbin.sbumpc() == L'a' );
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc	2003-09-23 22:03:02.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc	2005-05-17 22:46:40.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -35,7 +37,7 @@
   fbout.close();
   
   wfilebuf fbin;
-  locale loc(__gnu_test::try_named_locale("en_US.UTF-8"));
+  locale loc(locale("en_US.UTF-8"));
   fbin.pubimbue(loc);
   fbin.open(name_02, ios_base::in);
   VERIFY( fbin.sbumpc() == L'a' );
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc	2003-09-23 22:03:02.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc	2005-05-17 22:46:55.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -34,7 +36,7 @@
   fbout.close();
   
   wfilebuf fbin;
-  locale loc(__gnu_test::try_named_locale("en_US.UTF-8"));
+  locale loc(locale("en_US.UTF-8"));
   fbin.pubimbue(loc);
   fbin.pubsetbuf(0, 0);
   fbin.open(name_03, ios_base::in);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc	2003-09-23 22:03:02.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc	2005-05-17 22:47:08.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -35,7 +37,7 @@
   fbout.close();
   
   wfilebuf fbin;
-  locale loc(__gnu_test::try_named_locale("en_US.UTF-8"));
+  locale loc(locale("en_US.UTF-8"));
   fbin.pubimbue(loc);
   fbin.pubsetbuf(0, 0);
   fbin.open(name_04, ios_base::in);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc	2003-09-23 22:03:02.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc	2005-05-17 22:47:34.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -85,7 +87,7 @@
   const size_t clen = sizeof(cstr) / sizeof(cstr[0]);
   const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
 
-  locale loc = __gnu_test::try_named_locale("se_NO.UTF-8");
+  locale loc = locale("se_NO.UTF-8");
 
   FILE* file = fopen(name, "w");
   fwrite(cstr, 1, clen, file);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc	2003-09-23 22:03:02.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc	2005-05-17 22:47:47.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -86,7 +88,7 @@
   const size_t wlen = sizeof(wstr) / sizeof(wstr[0]);
 
   const int loops = 2 * BUFSIZ / wlen;
-  locale loc = __gnu_test::try_named_locale("se_NO.UTF-8");
+  locale loc = locale("se_NO.UTF-8");
 
   FILE* file = fopen(name, "w");
   for (int i = 0; i < loops; ++i)
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc	2003-09-23 22:03:02.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/4.cc	2005-05-17 22:48:03.000000000 +0200
@@ -1,7 +1,9 @@
+// { dg-require-namedlocale "" }
+
 // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
 // Adapted from 27_io/basic_filebuf/underflow/char/2.cc
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -30,7 +32,7 @@
   bool test __attribute__((unused)) = true;
   using namespace std;
 
-  locale loc (__gnu_test::try_named_locale("se_NO.UTF-8"));
+  locale loc (locale("se_NO.UTF-8"));
   wfilebuf fb_out, fb_in_out;
   fb_out.pubimbue(loc);
   fb_in_out.pubimbue(loc);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc	2003-09-23 22:03:02.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/5.cc	2005-05-17 22:48:16.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation
+// Copyright (C) 2003, 2005 Free Software Foundation
 //
 // 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
@@ -34,7 +36,7 @@
 
   wfilebuf fb;
   fb.pubsetbuf(0, 0);
-  fb.pubimbue(__gnu_test::try_named_locale("se_NO.UTF-8"));
+  fb.pubimbue(locale("se_NO.UTF-8"));
 
   FILE* file = fopen(name, "w");
   setvbuf(file, 0, _IONBF, 0);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc	2003-09-23 22:03:02.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc	2005-05-17 22:48:32.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-05-03  Petur Runolfsson <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -35,7 +37,7 @@
     putc(static_cast<unsigned char>(i), file);
   fclose(file);
 
-  locale loc (__gnu_test::try_named_locale("de_DE.ISO-8859-15@euro"));
+  locale loc (locale("de_DE.ISO-8859-15@euro"));
   wchar_t buf[1];
   wfilebuf fb;
   fb.pubimbue(loc);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ios/copyfmt/char/2.cc libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ios/copyfmt/char/2.cc	2003-09-23 22:03:05.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc	2005-05-17 22:49:17.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 1999-09-20 bkoz
 
-// Copyright (C) 1999, 2003 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2003, 2005 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
@@ -43,7 +45,7 @@
   typedef std::ios_base::fmtflags fmtflags;
   typedef std::ios_base::iostate iostate;
   locale loc_c = locale::classic();
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   std::ios ios_01(NULL);
   std::ios ios_02(NULL);
   ios_01.imbue(loc_c);
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc	2005-01-24 00:35:15.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc	2005-05-17 22:49:44.000000000 +0200
@@ -1,3 +1,5 @@
+// { dg-require-namedlocale "" }
+
 // 1999-11-15 Kevin Ediger  <kediger@licor.com>
 // test the floating point inserters (facet num_put)
 
@@ -41,7 +43,7 @@
   os2.setf(ios::fixed);
 
   // Check it can be done in a locale with grouping on.
-  locale loc2 = __gnu_test::try_named_locale("de_DE");
+  locale loc2 = locale("de_DE");
   os2.imbue(loc2);
   os2 << fixed << setprecision(3) << val2 << endl;
   os2 << endl;
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc	2005-01-24 00:35:16.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc	2005-05-17 22:50:00.000000000 +0200
@@ -1,3 +1,5 @@
+// { dg-require-namedlocale "" }
+
 // Copyright (C) 2005 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -38,7 +40,7 @@
   os2.setf(wios::fixed);
 
   // Check it can be done in a locale with grouping on.
-  locale loc2 = __gnu_test::try_named_locale("de_DE");
+  locale loc2 = locale("de_DE");
   os2.imbue(loc2);
   os2 << fixed << setprecision(3) << val2 << endl;
   os2 << endl;
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/char/13007-1.cc libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/char/13007-1.cc	2003-11-14 00:13:21.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-1.cc	2005-05-17 23:34:40.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -35,7 +37,7 @@
   bool test __attribute__((unused)) = true;
   
   Buf1 buf;
-  std::locale loc(__gnu_test::try_named_locale("is_IS.UTF-8"));
+  std::locale loc(std::locale("is_IS.UTF-8"));
 
   buf.pubimbue(loc);
 
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc	2003-11-14 00:13:21.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc	2005-05-17 23:34:52.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -45,7 +47,7 @@
   bool test __attribute__((unused)) = true;
 
   Buf2 buf;
-  std::locale loc(__gnu_test::try_named_locale("en_US"));
+  std::locale loc(std::locale("en_US"));
 
   buf.pubimbue(loc);
 
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/char/9322.cc libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/9322.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/char/9322.cc	2004-07-11 21:13:56.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/9322.cc	2005-05-17 22:52:18.000000000 +0200
@@ -1,6 +1,9 @@
+// { dg-require-namedlocale "" }
+
 // 1999-10-11 bkoz
 
-// Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005 
+// 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
@@ -51,10 +54,10 @@
   testbuf ob;
   VERIFY( ob.getloc() == loc );
 
-  locale::global(__gnu_test::try_named_locale("en_US"));
+  locale::global(locale("en_US"));
   VERIFY( ob.getloc() == loc );
 
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   locale ret = ob.pubimbue(loc_de);
   VERIFY( ob.getloc() == loc_de );
   VERIFY( ret == loc );
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-1.cc libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-1.cc	2003-11-14 00:13:22.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-1.cc	2005-05-17 23:35:01.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -35,7 +37,7 @@
   bool test __attribute__((unused)) = true;
   
   Buf1 buf;
-  std::locale loc(__gnu_test::try_named_locale("is_IS.UTF-8"));
+  std::locale loc(std::locale("is_IS.UTF-8"));
 
   buf.pubimbue(loc);
 
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc	2003-11-14 00:13:22.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc	2005-05-17 23:35:08.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2003, 2005 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
@@ -45,7 +47,7 @@
   bool test __attribute__((unused)) = true;
 
   Buf2 buf;
-  std::locale loc(__gnu_test::try_named_locale("en_US"));
+  std::locale loc(std::locale("en_US"));
 
   buf.pubimbue(loc);
 
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc	2004-07-11 21:13:56.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc	2005-05-17 22:53:11.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 1999-10-11 bkoz
 
-// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -52,10 +54,10 @@
   testbuf ob;
   VERIFY( ob.getloc() == loc );
 
-  locale::global(__gnu_test::try_named_locale("en_US"));
+  locale::global(locale("en_US"));
   VERIFY( ob.getloc() == loc );
 
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   locale ret = ob.pubimbue(loc_de);
   VERIFY( ob.getloc() == loc_de );
   VERIFY( ret == loc );
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc	2003-09-23 22:03:20.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc	2005-05-17 22:50:49.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2005 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
@@ -33,10 +35,10 @@
   std::stringbuf ob;
   VERIFY( ob.getloc() == loc );
 
-  locale::global(__gnu_test::try_named_locale("en_US"));
+  locale::global(locale("en_US"));
   VERIFY( ob.getloc() == loc );
 
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   locale ret = ob.pubimbue(loc_de);
   VERIFY( ob.getloc() == loc_de );
   VERIFY( ret == loc );
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc	2004-07-10 00:00:53.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc	2005-05-17 22:51:07.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 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
@@ -33,10 +35,10 @@
   std::wstringbuf ob;
   VERIFY( ob.getloc() == loc );
 
-  locale::global(__gnu_test::try_named_locale("en_US"));
+  locale::global(locale("en_US"));
   VERIFY( ob.getloc() == loc );
 
-  locale loc_de = __gnu_test::try_named_locale("de_DE");
+  locale loc_de = locale("de_DE");
   locale ret = ob.pubimbue(loc_de);
   VERIFY( ob.getloc() == loc_de );
   VERIFY( ret == loc );
diff -urN libstdc++-v3-orig/testsuite/27_io/objects/wchar_t/10.cc libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc
--- libstdc++-v3-orig/testsuite/27_io/objects/wchar_t/10.cc	2003-09-23 22:03:28.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc	2005-05-17 20:09:16.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-05-01  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -30,7 +32,7 @@
   bool test __attribute__((unused)) = true;
   const char* name = "tmp_10";
 
-  locale loc(__gnu_test::try_named_locale("se_NO.UTF-8"));
+  locale loc(locale("se_NO.UTF-8"));
   locale::global(loc);
   wcin.imbue(loc);
   wcout.imbue(loc);
diff -urN libstdc++-v3-orig/testsuite/27_io/objects/wchar_t/11.cc libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc
--- libstdc++-v3-orig/testsuite/27_io/objects/wchar_t/11.cc	2003-09-23 22:03:28.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/11.cc	2005-05-17 20:09:33.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-05-01  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -30,7 +32,7 @@
   bool test __attribute__((unused)) = true;
   const char* name = "tmp_11";
 
-  locale loc(__gnu_test::try_named_locale("se_NO.UTF-8"));
+  locale loc(locale("se_NO.UTF-8"));
   locale::global(loc);
   wcin.imbue(loc);
   wcout.imbue(loc);
diff -urN libstdc++-v3-orig/testsuite/27_io/objects/wchar_t/12.cc libstdc++-v3/testsuite/27_io/objects/wchar_t/12.cc
--- libstdc++-v3-orig/testsuite/27_io/objects/wchar_t/12.cc	2003-09-23 22:03:28.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/12.cc	2005-05-17 20:09:51.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -35,7 +37,7 @@
   bool test __attribute__((unused)) = true;
   const char* name = "tmp_12";
 
-  locale loc(__gnu_test::try_named_locale("se_NO.UTF-8"));
+  locale loc(locale("se_NO.UTF-8"));
   locale::global(loc);
   std::ios_base::sync_with_stdio(false);
   wcout.imbue(loc);
diff -urN libstdc++-v3-orig/testsuite/27_io/objects/wchar_t/13.cc libstdc++-v3/testsuite/27_io/objects/wchar_t/13.cc
--- libstdc++-v3-orig/testsuite/27_io/objects/wchar_t/13.cc	2003-09-23 22:03:28.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/13.cc	2005-05-17 20:10:11.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-09-04  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -35,7 +37,7 @@
   bool test __attribute__((unused)) = true;
   const char* name = "tmp_13";
 
-  locale loc(__gnu_test::try_named_locale("se_NO.UTF-8"));
+  locale loc(locale("se_NO.UTF-8"));
   locale::global(loc);
   std::ios_base::sync_with_stdio(false);
   wcin.imbue(loc);
diff -urN libstdc++-v3-orig/testsuite/27_io/objects/wchar_t/9520.cc libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc
--- libstdc++-v3-orig/testsuite/27_io/objects/wchar_t/9520.cc	2003-09-23 22:03:28.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc	2005-05-17 20:10:31.000000000 +0200
@@ -1,6 +1,8 @@
+// { dg-require-namedlocale "" }
+
 // 2003-04-30  Petur Runolfsson <peturr02@ru.is>
 
-// Copyright (C) 2003 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2005 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
@@ -34,7 +36,7 @@
     putc(static_cast<unsigned char>(i), file);
   fclose(file);
 
-  locale loc (__gnu_test::try_named_locale("de_DE.ISO-8859-15@euro"));
+  locale loc (locale("de_DE.ISO-8859-15@euro"));
   locale::global(loc); // Set locale for stdin
 
   freopen(name, "r", stdin);
diff -urN libstdc++-v3-orig/testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc
--- libstdc++-v3-orig/testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc	2004-04-19 21:00:09.000000000 +0200
+++ libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc	2005-05-17 20:11:07.000000000 +0200
@@ -1,4 +1,6 @@
-// Copyright (C) 2004 Free Software Foundation
+// { dg-require-namedlocale "" }
+
+// Copyright (C) 2004, 2005 Free Software Foundation
 //
 // 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,7 +30,7 @@
 
   const char* name = "tmp_12077";
 
-  locale loc = __gnu_test::try_named_locale("is_IS.UTF-8");
+  locale loc = locale("is_IS.UTF-8");
   locale::global(loc);
   wcin.imbue(loc);
 
diff -urN libstdc++-v3-orig/testsuite/lib/dg-options.exp libstdc++-v3/testsuite/lib/dg-options.exp
--- libstdc++-v3-orig/testsuite/lib/dg-options.exp	2004-02-27 23:01:31.000000000 +0100
+++ libstdc++-v3/testsuite/lib/dg-options.exp	2005-05-17 17:55:13.000000000 +0200
@@ -1,6 +1,6 @@
 # Handlers for additional dg-xxx keywords in tests.
 
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,3 +27,11 @@
     return
 }
 
+proc dg-require-namedlocale { args } {
+    if { ![ check_v3_target_namedlocale ] } {
+	upvar dg-do-what dg-do-what
+	set dg-do-what [list [lindex ${dg-do-what} 0] "N" "P"]
+	return
+    }
+    return
+}
diff -urN libstdc++-v3-orig/testsuite/lib/libstdc++.exp libstdc++-v3/testsuite/lib/libstdc++.exp
--- libstdc++-v3-orig/testsuite/lib/libstdc++.exp	2005-05-05 06:05:35.000000000 +0200
+++ libstdc++-v3/testsuite/lib/libstdc++.exp	2005-05-18 01:04:53.000000000 +0200
@@ -1,6 +1,6 @@
 # libstdc++ "tool init file" for DejaGNU
 
-# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -342,3 +342,91 @@
 	append v3-test_objs "$object_file "
     }
 }
+
+proc check_v3_target_namedlocale { } {
+    global et_namedlocale_saved
+    global et_namedlocale_target_name
+    global tool	
+
+    if { ![info exists et_namedlocale_target_name] } {
+	set et_namedlocale_target_name ""
+    }
+
+    # If the target has changed since we set the cached value, clear it.
+    set current_target [current_target_name]
+    if { $current_target != $et_namedlocale_target_name } {
+	verbose "check_v3_target_namedlocale: `$et_namedlocale_target_name'" 2
+	set et_namedlocale_target_name $current_target
+	if [info exists et_namedlocale_saved] {
+	    verbose "check_v3_target_namedlocale: removing cached result" 2
+	    unset et_namedlocale_saved
+	}
+    }
+
+    if [info exists et_namedlocale_saved] {
+	verbose "check_v3_target_namedlocale: using cached result" 2
+    } else {
+	set et_namedlocale_saved 0
+
+	# Set up, compile, and execute a C++ test program that tries to use
+	# all the required named locales.
+	set src nlocale[pid].cc
+	set exe nlocale[pid].x
+
+	set f [open $src "w"]
+	puts $f "#include <locale>"
+	puts $f "using namespace std;"	
+	puts $f "int main ()"
+	puts $f "{"
+	puts $f "  try"	
+	puts $f "  {" 
+	puts $f "     locale(\"\");"
+	puts $f "     locale(\"de_DE\");"
+	puts $f "     locale(\"de_DE.ISO-8859-15@euro\");"
+	puts $f "     locale(\"de_DE@euro\");"
+	puts $f "     locale(\"en_HK\");"
+	puts $f "     locale(\"en_PH\");"
+	puts $f "     locale(\"en_US\");"
+	puts $f "     locale(\"en_US.ISO-8859-1\");"
+	puts $f "     locale(\"en_US.ISO-8859-15\");"
+	puts $f "     locale(\"en_US.UTF-8\");"
+	puts $f "     locale(\"es_ES\");"
+	puts $f "     locale(\"es_MX\");"
+	puts $f "     locale(\"fr_FR\");"
+	puts $f "     locale(\"fr_FR@euro\");"
+	puts $f "     locale(\"is_IS\");"
+	puts $f "     locale(\"is_IS.UTF-8\");"
+	puts $f "     locale(\"it_IT\");"
+	puts $f "     locale(\"ja_JP.eucjp\");"
+	puts $f "     locale(\"se_NO.UTF-8\");"
+	puts $f "     locale(\"ta_IN\");"
+	puts $f "     locale(\"zh_TW\");"
+	puts $f "     return 0;"
+	puts $f "  }"
+	puts $f "  catch(...)"
+	puts $f "  {"
+	puts $f "     return 1;"
+	puts $f "  }"	
+	puts $f "}"
+	close $f
+
+	set lines [v3_target_compile $src $exe executable ""]
+	file delete $src
+
+	if [string match "" $lines] {
+	    # No error message, compilation succeeded.
+	    set result [${tool}_load "./$exe" "" ""]
+	    set status [lindex $result 0]
+	    remote_file build delete $exe
+
+	    verbose "check_v3_target_namedlocale: status is <$status>" 2
+
+	    if { $status == "pass" } {
+		set et_namedlocale_saved 1
+	    }
+	} else {
+	    verbose "check_v3_target_namedlocale: compilation failed" 2
+	}
+    }
+    return $et_namedlocale_saved
+}
diff -urN libstdc++-v3-orig/testsuite/testsuite_hooks.cc libstdc++-v3/testsuite/testsuite_hooks.cc
--- libstdc++-v3-orig/testsuite/testsuite_hooks.cc	2005-05-06 19:03:06.000000000 +0200
+++ libstdc++-v3/testsuite/testsuite_hooks.cc	2005-05-17 17:58:59.000000000 +0200
@@ -162,7 +162,7 @@
     bool test = true;
     
     // Set the global locale. 
-    locale loc_name = try_named_locale(name);
+    locale loc_name = locale(name);
     locale orig = locale::global(loc_name);
 
     const char* res = setlocale(LC_ALL, name);
@@ -192,7 +192,7 @@
     
 #ifdef _GLIBCXX_HAVE_SETENV 
     // Set the global locale. 
-    locale loc_name = try_named_locale(name);
+    locale loc_name = locale(name);
     locale orig = locale::global(loc_name);
 
     // Set environment variable env to value in name. 
@@ -214,25 +214,6 @@
 #endif
   }
 
-  std::locale 
-  try_named_locale(const char* name)
-  {
-    try
-      {
-	return std::locale(name);
-      }
-#ifdef __EXCEPTIONS
-    catch (std::runtime_error& ex)
-      {
-	// Thrown by generic and gnu implemenation if named locale fails.
-	if (std::strstr(ex.what(), "name not valid"))
-	  exit(0);
-	else
-	  throw;
-      }
-#endif
-  }
-
   counter::size_type  counter::count = 0;
   unsigned int copy_constructor::count_ = 0;
   unsigned int copy_constructor::throw_on_ = 0;
diff -urN libstdc++-v3-orig/testsuite/testsuite_hooks.h libstdc++-v3/testsuite/testsuite_hooks.h
--- libstdc++-v3-orig/testsuite/testsuite_hooks.h	2005-05-06 19:03:06.000000000 +0200
+++ libstdc++-v3/testsuite/testsuite_hooks.h	2005-05-17 17:59:12.000000000 +0200
@@ -160,11 +160,6 @@
   void 
   run_tests_wrapped_env(const char*, const char*, const func_callback&);
 
-  // Try to create a locale with the given name. If it fails, bail.
-  std::locale
-  try_named_locale(const char* name);
-
-
   // Counting.
   struct counter
   {

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]