This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
Re: [v3] 12855 continued
Ack! Too much eggnog: PCH doesn't work if the -include is after the -I flags.
Doh!
This is a partial reversion of the pch bits of the previous patch, to
get the 'make check' speed back to normal. The other bits still stand.
The main problem:
g++ $PCHFLAGS $INCLUDES $CXXFLAGS $DEFAULT_CXXFLAGS
where we're trying to negate PCHFLAGS in DEFAULT_CXXFLAGS, with a
dg-options string.
Not possible, I think. I give! Dejagnu wins again.
tested and timed x86/linux
-benjamin
2003-12-22 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/libstdc++-dg/normal.exp: Remove cxxpchflags here...
* testsuite/lib/libstdc++.exp (v3_target_compile): Add in cxxpchflags.
(v3-init): Same.
Index: testsuite/lib/libstdc++.exp
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/lib/libstdc++.exp,v
retrieving revision 1.14
diff -c -p -r1.14 libstdc++.exp
*** testsuite/lib/libstdc++.exp 11 Dec 2003 01:08:14 -0000 1.14
--- testsuite/lib/libstdc++.exp 22 Dec 2003 22:14:37 -0000
*************** proc v3-init { args } {
*** 44,49 ****
--- 44,50 ----
global cxx
global includes
global cxxflags
+ global cxxpchflags
global objdir
global gluefile wrap_flags
global env
*************** proc v3-init { args } {
*** 128,133 ****
--- 129,135 ----
}
set cxx [transform "g++"]
set cxxflags "-ggdb3 -D_GLIBCXX_ASSERT"
+ set cxxpchflags ""
set includes "-I./"
} else {
# If we find a testsuite_flags file, we're testing in the build dir.
*************** proc v3-init { args } {
*** 135,144 ****
--- 137,148 ----
if { [file exists $flags_file] } {
set cxx [exec sh $flags_file --build-cxx]
set cxxflags [exec sh $flags_file --cxxflags]
+ set cxxpchflags [exec sh $flags_file --cxxpchflags]
set includes [exec sh $flags_file --build-includes]
} else {
set cxx [transform "g++"]
set cxxflags "-ggdb3 -D_GLIBCXX_ASSERT"
+ set cxxpchflags ""
set includes "-I${srcdir}"
}
}
*************** proc v3_target_compile { source dest typ
*** 210,215 ****
--- 214,220 ----
global wrap_flags
global cxx
global cxxflags
+ global cxxpchflags
global includes
global blddir
*************** proc v3_target_compile { source dest typ
*** 222,227 ****
--- 227,233 ----
set cxxlibglossflags [libgloss_link_flags]
set cxx_final [concat $cxx_final $cxxlibglossflags]
set cxx_final [concat $cxx_final $cxxflags]
+ set cxx_final [concat $cxx_final $cxxpchflags]
set cxx_final [concat $cxx_final $includes]
lappend options "compiler=$cxx_final"
Index: testsuite/libstdc++-dg/normal.exp
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/testsuite/libstdc++-dg/normal.exp,v
retrieving revision 1.3
diff -c -p -r1.3 normal.exp
*** testsuite/libstdc++-dg/normal.exp 22 Dec 2003 20:09:23 -0000 1.3
--- testsuite/libstdc++-dg/normal.exp 22 Dec 2003 22:14:37 -0000
*************** global DEFAULT_CXXFLAGS
*** 32,46 ****
if ![info exists DEFAULT_CXXFLAGS] then {
set DEFAULT_CXXFLAGS "-D_GLIBCXX_ASSERT"
- # Set up includes for stdc++.h.gch, the precompiled header file.
- set flags_file "${blddir}/scripts/testsuite_flags"
- if { [file exists $flags_file] } {
- set cxxpchflags [exec sh $flags_file --cxxpchflags]
- } else {
- set cxxpchflags ""
- }
- append DEFAULT_CXXFLAGS " ${cxxpchflags}"
-
# Host specific goo here.
if { [string match "powerpc-*-darwin*" $target_triplet] } {
append DEFAULT_CXXFLAGS " -multiply_defined suppress"
--- 32,37 ----