mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-24 20:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR d/87824 (x86_64-linux multilib issues)

Browse Source 
PR d/87824
	* lib/gdc.exp (gdc_include_flags): Find C++ headers by calling
	libstdc++v3/scripts/testsuite_flags.  Filter out unsupported
	-nostdinc++ flag.

From-SVN: r269625
This commit is contained in:
Uros Bizjak 2019-03-12 19:37:31 +01:00
parent 1eabf876d5
commit 035f5b9e0b
2 changed files with 14 additions and 9 deletions
gcc/testsuite
ChangeLog
lib
gdc.exp

10
gcc/testsuite/ChangeLog

@ -1,3 +1,10 @@
2019-03-12 Uroš Bizjak <ubizjak@gmail.com>
PR d/87824
* lib/gdc.exp (gdc_include_flags): Find C++ headers by calling
libstdc++v3/scripts/testsuite_flags. Filter out unsupported
-nostdinc++ flag.
2019-03-12 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/87673
@ -9,8 +16,7 @@
2019-03-12 Martin Liska <mliska@suse.cz>
* gfortran.dg/abstract_type_3.f03: Amend test-case scan
patterns.
* gfortran.dg/abstract_type_3.f03: Amend test-case scan patterns.
* gfortran.dg/binding_label_tests_4.f03: Likewise.
* gfortran.dg/c_f_pointer_tests_6.f90: Likewise.
* gfortran.dg/c_funloc_tests_6.f90: Likewise.

13
gcc/testsuite/lib/gdc.exp

@ -88,14 +88,13 @@ proc gdc_include_flags { paths } {
append flags "-I${srcdir}/../../libphobos/libdruntime "
append flags "-I${srcdir}/../../libphobos/src "
# For the tests that mix C++ and D, we should try and handle this better.
if { $gccpath != "" } {
if [file exists "${gccpath}/libstdc++-v3/include"] {
append flags "-I${gccpath}/libstdc++-v3/include "
append flags "-I${gccpath}/libstdc++-v3/include/$target "
}
# For the tests that mix C++ and D, need to know where headers are located.
set odir [lookfor_file ${gccpath} libstdc++-v3]
if { ${odir} != "" } {
set cxxflags [exec sh ${odir}/scripts/testsuite_flags --build-includes]
set idx [lsearch $cxxflags "-nostdinc++"]
append flags [lreplace $cxxflags $idx $idx]
}
append flags "-I${srcdir}/../../libstdc++-v3/libsupc++"
}
#