[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Fix libstdc++ testing using upstream dejagnu
From: |
Daniel Jacobowitz |
Subject: |
Fix libstdc++ testing using upstream dejagnu |
Date: |
Tue, 18 May 2004 18:20:37 -0400 |
User-agent: |
Mutt/1.5.5.1+cvs20040105i |
This patch fixes an issue I found last week when trying to test libstdc++.
-isystem on many targets implies an implicit extern "C" { }, which doesn't
work at all for the C++ headers. The version of DejaGNU in
sources.redhat.com has been using -I for as far back as CVS history goes.
Patch OK? If so, please commit it.
--
Daniel Jacobowitz
2004-05-18 Daniel Jacobowitz <address@hidden>
* lib/libgloss.exp (newlib_include_flags, libio_include_flags)
(g++_include_flags, libstdc++_include_flags)
(winsup_include_flags): Use -I instead of -isystem.
(build_wrapper): Remote extra line.
Index: libgloss.exp
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/lib/libgloss.exp,v
retrieving revision 1.15
diff -u -p -r1.15 libgloss.exp
--- libgloss.exp 21 Apr 2004 16:50:23 -0000 1.15
+++ libgloss.exp 18 May 2004 22:17:18 -0000
@@ -158,7 +158,7 @@ proc newlib_include_flags { args } {
if { ${newlib_dir} != "" } {
set newlib_dir [file dirname ${newlib_dir}]
}
- return " -isystem $gccpath/newlib/targ-include -isystem ${newlib_dir}"
+ return " -I$gccpath/newlib/targ-include -I${newlib_dir}"
} else {
verbose "No newlib support for this target"
}
@@ -190,7 +190,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 " -isystem ${libio_src_dir} -isystem ${libio_bin_dir}"
+ return " -I${libio_src_dir} -I${libio_bin_dir}"
} else {
return ""
}
@@ -225,23 +225,23 @@ proc g++_include_flags { args } {
set dir [lookfor_file ${srcdir} libg++]
if { ${dir} != "" } {
- append flags " -isystem ${dir} -isystem ${dir}/src"
+ append flags " -I${dir} -I${dir}/src"
}
set dir [lookfor_file ${srcdir} libstdc++-v3]
if { ${dir} != "" } {
- append flags " -isystem ${dir}/include -isystem ${dir}/include/std"
- append flags " -isystem ${dir}/include/c_std -isystem ${dir}/libsupc++"
+ append flags " -I${dir}/include -I${dir}/include/std"
+ append flags " -I${dir}/include/c_std -I${dir}/libsupc++"
}
set dir [lookfor_file ${gccpath} libstdc++-v3]
if { ${dir} != "" } {
- append flags " -isystem ${dir}/include -isystem
${dir}/include/${target_alias}"
+ append flags " -I${dir}/include -I${dir}/include/${target_alias}"
}
set dir [lookfor_file ${srcdir} libstdc++]
if { ${dir} != "" } {
- append flags " -isystem ${dir} -isystem ${dir}/stl"
+ append flags " -I${dir} -I${dir}/stl"
}
return "$flags"
@@ -317,20 +317,20 @@ proc libstdc++_include_flags { args } {
set dir [lookfor_file ${srcdir} libstdc++-v3]
if { ${dir} != "" } {
- append flags " -isystem ${dir}/include -isystem ${dir}/include/std"
- append flags " -isystem ${dir}/include/c_std -isystem ${dir}/libsupc++"
+ append flags " -I${dir}/include -I${dir}/include/std"
+ append flags " -I${dir}/include/c_std -I${dir}/libsupc++"
}
set gccpath [get_multilibs]
set dir [lookfor_file ${gccpath} libstdc++-v3]
if { ${dir} != "" } {
- append flags " -isystem ${dir}/include -isystem
${dir}/include/${target_alias}"
+ append flags " -I${dir}/include -I${dir}/include/${target_alias}"
}
set dir [lookfor_file ${srcdir} libstdc++]
if { ${dir} != "" } {
- append flags " -isystem ${dir} -isystem ${dir}/stl"
+ append flags " -I${dir} -I${dir}/stl"
}
return "$flags"
@@ -857,7 +857,6 @@ proc build_wrapper { gluefile } {
set flags ""
if [target_info exists is_vxworks] {
set flags "additional_flags=-DVXWORKS"
- set result "-Wl,-wrap,exit -Wl,-wrap,main -Wl,-wrap,abort"
set result "-Wl,-wrap,exit -Wl,-wrap,_exit -Wl,-wrap,main
-Wl,-wrap,abort"
} else {
set result "-Wl,-wrap,exit -Wl,-wrap,_exit -Wl,-wrap,main
-Wl,-wrap,abort"
@@ -894,7 +893,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 " -isystem ${winsup_dir}"
+ return " -I${winsup_dir}"
}
}
verbose "No winsup support for this target"
- Fix libstdc++ testing using upstream dejagnu,
Daniel Jacobowitz <=
- Re: Fix libstdc++ testing using upstream dejagnu, Rob Savoye, 2004/05/18
- Re: Fix libstdc++ testing using upstream dejagnu, Daniel Jacobowitz, 2004/05/18
- Re: Fix libstdc++ testing using upstream dejagnu, Rob Savoye, 2004/05/18
- Re: Fix libstdc++ testing using upstream dejagnu, Hans-Peter Nilsson, 2004/05/19
- Re: Fix libstdc++ testing using upstream dejagnu, Daniel Jacobowitz, 2004/05/19
- Re: Fix libstdc++ testing using upstream dejagnu, Hans-Peter Nilsson, 2004/05/19
- Re: Fix libstdc++ testing using upstream dejagnu, Daniel Jacobowitz, 2004/05/19
- Re: Fix libstdc++ testing using upstream dejagnu, Hans-Peter Nilsson, 2004/05/22