From d6c66ec322c2297eb2f152e8d6e9e426560a7d5a Mon Sep 17 00:00:00 2001 From: nickc Date: Thu, 11 Nov 2004 11:55:10 +0000 Subject: [PATCH] Hans-Peter Nilsson * lib/libgloss.exp (newlib_include_flags): Use -isystem, not -I. (libio_include_flags, g++_include_flags, libstdc++_include_flags, winsup_include_flags): Ditto. * doc/user.sgml (Local Config File): Use -isystem, not -I, in example. --- dejagnu/ChangeLog | 14 ++++++++++++++ dejagnu/doc/user.sgml | 16 ++++++++-------- dejagnu/lib/libgloss.exp | 22 +++++++++++----------- 3 files changed, 33 insertions(+), 19 deletions(-) diff --git a/dejagnu/ChangeLog b/dejagnu/ChangeLog index 76e152d4e9..3916d011e9 100644 --- a/dejagnu/ChangeLog +++ b/dejagnu/ChangeLog @@ -1,3 +1,17 @@ +2004-11-11 Nick Clifton + + * Import this patch from dejagnu mainline sources. It fixes + unexpected failures in the GCC and G++ testsuites where + is #include's in strict ANSI mode. + + 2002-11-12 Hans-Peter Nilsson + + * lib/libgloss.exp (newlib_include_flags): Use -isystem, not -I. + (libio_include_flags, g++_include_flags, libstdc++_include_flags, + winsup_include_flags): Ditto. + * doc/user.sgml (Local Config File): Use -isystem, not -I, in + example. + 2004-10-28 Nick Clifton * baseboards/iq2000-sim.exp: New file. diff --git a/dejagnu/doc/user.sgml b/dejagnu/doc/user.sgml index cec52dcda6..7aab2996f0 100644 --- a/dejagnu/doc/user.sgml +++ b/dejagnu/doc/user.sgml @@ -803,13 +803,13 @@ Local Config File - + It is usually more convenient to keep these manual overrides in the site.exp local to each test directory, rather than in the global site.exp in the installed DejaGnu library. This file is mostly for supplying tool specific info - that is required by the test suite. + that is required by the testsuite. All local site.exp files have two sections, separated by comment text. The first section is @@ -869,7 +869,7 @@ Local Config File - + ## these variables are automatically generated by make ## # Do not edit here. If you wish to override these values # add them to the last section @@ -879,26 +879,26 @@ set target_triplet i586-pc-linux-gnulibc1 set target_alias i586-pc-linux-gnulibc1 set CFLAGS "" - set CXXFLAGS "-I/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libio -I$srcdir/../libg++/src -I$srcdir/../libio -I$srcdir/../libstdc++ -I$srcdir/../libstdc++/stl -L/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libg++ -L/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libstdc++" + set CXXFLAGS "-isystem /build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libio -isystem $srcdir/../libg++/src -isystem $srcdir/../libio -isystem $srcdir/../libstdc++ -isystem $srcdir/../libstdc++/stl -L/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libg++ -L/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../libstdc++" append LDFLAGS " -L/build/devo-builds/i586-pc-linux-gnulibc1/gcc/../ld" set tmpdir /build/devo-builds/i586-pc-linux-gnulibc1/gcc/testsuite set srcdir "${srcdir}/testsuite" ## All variables above are generated by configure. Do Not Edit ## - - + + This file defines the required fields for a local config file, namely the three config triplets, and the srcdir. It also defines several other Tcl variables that are used exclusivly by - the GCC test suite. For most test cases, the CXXFLAGS and LDFLAGS + the GCC testsuite. For most test cases, the CXXFLAGS and LDFLAGS are supplied by DejaGnu itself for cross testing, but to test a compiler, GCC needs to manipulate these itself. Global Config File - + The master config file is where all the target specific config variables get set for a whole site get set. The idea is that for a centralized testing lab where people have to share a diff --git a/dejagnu/lib/libgloss.exp b/dejagnu/lib/libgloss.exp index 430195bc98..8af6849a28 100644 --- a/dejagnu/lib/libgloss.exp +++ b/dejagnu/lib/libgloss.exp @@ -159,7 +159,7 @@ proc newlib_include_flags { args } { if { ${newlib_dir} != "" } { set newlib_dir [file dirname ${newlib_dir}] } - return " -I$gccpath/newlib/targ-include -I${newlib_dir}" + return " -isystem $gccpath/newlib/targ-include -isystem ${newlib_dir}" } else { verbose "No newlib support for this target" } @@ -191,7 +191,7 @@ proc libio_include_flags { args } { if { $libio_bin_dir != "" && $libio_src_dir != "" } { set libio_src_dir [file dirname ${libio_src_dir}] set libio_bin_dir [file dirname ${libio_bin_dir}]; - return " -I${libio_src_dir} -I${libio_bin_dir}" + return " -isystem ${libio_src_dir} -isystem ${libio_bin_dir}" } else { return "" } @@ -226,22 +226,22 @@ proc g++_include_flags { args } { set dir [lookfor_file ${srcdir} libg++] if { ${dir} != "" } { - append flags " -I${dir} -I${dir}/src" + append flags " -isystem ${dir} -isystem ${dir}/src" } set dir [lookfor_file ${srcdir} libstdc++-v3] if { ${dir} != "" } { - append flags " -I${dir}/include -I${dir}/include/std -I${dir}/include/c_std -I${dir}/libsupc++" + append flags " -isystem ${dir}/include -isystem ${dir}/include/std -isystem ${dir}/include/c_std -isystem ${dir}/libsupc++" } set dir [lookfor_file ${gccpath} libstdc++-v3] if { ${dir} != "" } { - append flags " -I${dir}/include -I${dir}/include/${target_alias}" + append flags " -isystem ${dir}/include -isystem ${dir}/include/${target_alias}" } set dir [lookfor_file ${srcdir} libstdc++] if { ${dir} != "" } { - append flags " -I${dir} -I${dir}/stl" + append flags " -isystem ${dir} -isystem ${dir}/stl" } return "$flags" @@ -317,19 +317,19 @@ proc libstdc++_include_flags { args } { set dir [lookfor_file ${srcdir} libstdc++-v3] if { ${dir} != "" } { - append flags " -I${dir}/include -I${dir}/include/std -I${dir}/include/c_std -I${dir}/libsupc++" + append flags " -isystem ${dir}/include -isystem ${dir}/include/std -isystem ${dir}/include/c_std -isystem ${dir}/libsupc++" } set gccpath [get_multilibs] set dir [lookfor_file ${gccpath} libstdc++-v3] if { ${dir} != "" } { - append flags " -I${dir}/include -I${dir}/include/${target_alias}" + append flags " -isystem ${dir}/include -isystem ${dir}/include/${target_alias}" } set dir [lookfor_file ${srcdir} libstdc++] if { ${dir} != "" } { - append flags " -I${dir} -I${dir}/stl" + append flags " -isystem ${dir} -isystem ${dir}/stl" } return "$flags" @@ -376,7 +376,7 @@ proc libstdc++_link_flags { args } { # # Get the list of directories and -m options for gcc. This is kinda bogus that -# generic testing software needs support for gcc hardwired in, but to make +# generic testing software needs support for gcc hardwired in, but to make # testing the GNU tools work right, there didn't seem to be any other way. # @@ -867,7 +867,7 @@ proc winsup_include_flags { args } { set winsup_dir [lookfor_file ${srcdir} winsup/include/windows.h] if { ${winsup_dir} != "" } { set winsup_dir [file dirname ${winsup_dir}] - return " -I${winsup_dir}" + return " -isystem ${winsup_dir}" } } verbose "No winsup support for this target" -- 2.11.0