Import some missing hunks from this patch on sourceware:

2004-11-11  Nick Clifton  <nickc@redhat.com>
	* lib/libgloss.exp (libio_include_flags, g++_include_flags,
	winsup_include_flags): Revert previous patch, restoring the use of
	-I, for all libraries except newlib.  Newlib needs -isystem to
	avoid the problems with <limits.h> but the C++ and winsup
	libraries need -I because -isystem generates an implicit 'extern
	"C"' which may not be appropriate for certain targets.

ChangeLog

@@ -1,3 +1,16 @@
+2005-07-06  Ben Elliston  <bje@gnu.org>
+
+	Import some missing hunks from this patch on sourceware:
+
+	2004-11-11  Nick Clifton  <nickc@redhat.com>
+
+	* lib/libgloss.exp (libio_include_flags, g++_include_flags,
+	winsup_include_flags): Revert previous patch, restoring the use of
+	-I, for all libraries except newlib.  Newlib needs -isystem to
+	avoid the problems with <limits.h> but the C++ and winsup
+	libraries need -I because -isystem generates an implicit 'extern
+	"C"' which may not be appropriate for certain targets.
+
 2005-07-06  Aldy Hernandez  <aldyh@redhat.com>
 
 	* baseboards/ms1-sid.exp: New.

lib/libgloss.exp

@@ -242,8 +242,7 @@ proc g++_include_flags { args } {
 
     set dir [lookfor_file ${srcdir} libstdc++-v3]
     if { ${dir} != "" } {
-	append flags " -I${dir}/include -I${dir}/include/std"
-	append flags " -I${dir}/include/c_std -I${dir}/libsupc++"
+	append flags " -I${dir}/include -I${dir}/include/std -I${dir}/include/c_std -I${dir}/libsupc++"
     }
 
     set dir [lookfor_file ${gccpath} libstdc++-v3]
@@ -330,8 +329,7 @@ proc libstdc++_include_flags { args } {
     set dir [lookfor_file ${srcdir} libstdc++-v3]
     if { ${dir} != "" } {
 	# See comment in libio_include_flags about using -I.
-	append flags " -I${dir}/include -I${dir}/include/std"
-	append flags " -I${dir}/include/c_std -I${dir}/libsupc++"
+	append flags " -I${dir}/include -I${dir}/include/std -I${dir}/include/c_std -I${dir}/libsupc++"
     }
 
     set gccpath [get_multilibs]
@@ -906,7 +904,8 @@ 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}"
+	    # See comment in libio_include_flags about using -I.
+	    return " -I${winsup_dir}"
 	}
     }
     verbose "No winsup support for this target"