PR libstdc++/29722 continued

2007-01-24  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/29722 continued
	* testsuite/lib/libstdc++.exp (v3_target_compile_as_c): Add
	libsupc++ library directory.
	* testsuite/abi/cxx_runtime_only_linkage.cc: Remove hard-coded
	path specification.

From-SVN: r121117
This commit is contained in:
Benjamin Kosnik 2007-01-24 15:03:40 +00:00 committed by Benjamin Kosnik
parent f767122b2e
commit 9e4515539b
3 changed files with 18 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2007-01-24 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/29722 continued
* testsuite/lib/libstdc++.exp (v3_target_compile_as_c): Add
libsupc++ library directory.
* testsuite/abi/cxx_runtime_only_linkage.cc: Remove hard-coded
path specification.
2007-01-24 Andreas Krebbel <krebbel1@de.ibm.com> 2007-01-24 Andreas Krebbel <krebbel1@de.ibm.com>
* libsupc++/eh_personality.cc (parse_lsda_header, check_exception_spec, * libsupc++/eh_personality.cc (parse_lsda_header, check_exception_spec,

View File

@ -1,6 +1,6 @@
// { dg-do link } // { dg-do link }
// { dg-options "-x c -L../libsupc++/.libs -lsupc++" } // { dg-options "-x c -lsupc++" }
// Copyright (C) 2006 Free Software Foundation, Inc. // Copyright (C) 2006, 2007 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the

View File

@ -1,6 +1,6 @@
# libstdc++ "tool init file" for DejaGNU # libstdc++ "tool init file" for DejaGNU
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -359,6 +359,7 @@ proc v3_target_compile_as_c { source dest type options } {
global wrap_flags global wrap_flags
global includes global includes
global flags_file global flags_file
global blddir
if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } { if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
lappend options "libs=${gluefile}" lappend options "libs=${gluefile}"
@ -383,8 +384,14 @@ proc v3_target_compile_as_c { source dest type options } {
set includesbase "${comp_base_dir}/include/c++/${version}" set includesbase "${comp_base_dir}/include/c++/${version}"
set includestarget "${includesbase}/${machine}" set includestarget "${includesbase}/${machine}"
set cc_final [concat $cc_final "-I$includesbase -I$includestarget"] set cc_final [concat $cc_final "-I$includesbase -I$includestarget"]
set libsup "${comp_base_dir}/lib"
} else {
set libsup "${blddir}/libsupc++/.libs"
} }
set cc_final [concat $cc_final "-L$libsup"]
lappend options "compiler=$cc_final" lappend options "compiler=$cc_final"
lappend options "timeout=600" lappend options "timeout=600"