This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: PATCH: PR testsuite/40601: [4.5 Regression] Errors in "make check"
"H.J. Lu" <hjl.tools@gmail.com> writes:
> I checked it in with revision 149145 as an obvious fix.
>
> On Wed, Jul 1, 2009 at 10:06 AM, H.J. Lu<hongjiu.lu@intel.com> wrote:
>> Hi,
>>
>> We need to extract dirname from gccdir before using it.
>>
>> Index: ChangeLog
>> ===================================================================
>> --- ChangeLog ? (revision 149140)
>> +++ ChangeLog ? (working copy)
>> @@ -1,3 +1,10 @@
>> +2009-07-01 ?H.J. Lu ?<hongjiu.lu@intel.com>
>> +
>> + ? ? ? PR testsuite/40601
>> + ? ? ? * testsuite/lib/libffi-dg.exp (libffi-init): Properly set
>> + ? ? ? gccdir. ?Adjust ld_library_path for gcc only if gccdir isn't
>> + ? ? ? empty.
>> +
>> ?2009-06-30 ?Richard Sandiford ?<r.sandiford@uk.ibm.com>
>>
>> ? ? ? ?* testsuite/lib/libffi-dg.exp (libffi-init): Don't add "."
>> Index: testsuite/lib/libffi-dg.exp
>> ===================================================================
>> --- testsuite/lib/libffi-dg.exp (revision 149140)
>> +++ testsuite/lib/libffi-dg.exp (working copy)
>> @@ -108,7 +108,10 @@ proc libffi-init { args } {
>> ? ? verbose "libstdc++ $blddircxx"
>>
>> ? ? set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
>> - ? ?add_path ld_library_path [find_libgcc_s "$gccdir/xgcc"]
>> + ? ?if {$gccdir != ""} {
>> + ? ? ? ?set gccdir [file dirname $gccdir]
>> + ? ? ? add_path ld_library_path [find_libgcc_s "$gccdir/xgcc"]
>> + ? ?}
>> ? ? # add the library path for libffi.
>> ? ? add_path ld_library_path "${blddirffi}/.libs"
>> ? ? # add the library path for libstdc++ as well.
>>
The patch I was testing today was similar, but also restored the
ld_library_path assignment, with the initial value changed from "."
to "" as originally intended. Applied as obvious after testing
on x86_64-linux-gnu.
Richard
libffi/
* testsuite/lib/libffi-dg.exp (libffi-init): Set ld_library_path
to "" before adding paths. (This reinstates an assignment that
was removed by my 2009-06-30 commit, but changes the initial
value from "." to "".)
Index: libffi/testsuite/lib/libffi-dg.exp
===================================================================
--- libffi/testsuite/lib/libffi-dg.exp 2009-07-01 20:14:17.000000000 +0100
+++ libffi/testsuite/lib/libffi-dg.exp 2009-07-01 20:14:24.000000000 +0100
@@ -107,6 +107,7 @@ proc libffi-init { args } {
set blddircxx [lookfor_file [get_multilibs] libstdc++-v3]
verbose "libstdc++ $blddircxx"
+ set ld_library_path ""
set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
if {$gccdir != ""} {
set gccdir [file dirname $gccdir]