libffi merge

Andrew Haley aph@redhat.com
Fri Jun 5 17:37:00 GMT 2009


Andreas Tobler wrote:
> Andrew Haley wrote:
> 
>> Index: libffi.call/closure_loc_fn0.c
>> ===================================================================
>> --- libffi.call/closure_loc_fn0.c    (revision 0)
>> +++ libffi.call/closure_loc_fn0.c    (revision 0)
>> @@ -0,0 +1,95 @@
>> +/* Area:    closure_call
>> +   Purpose:    Check multiple values passing from different type.
>> +        Also, exceed the limit of gpr and fpr registers on PowerPC
>> +        Darwin.
>> +   Limitations:    none.
>> +   PR:        none.
>> +   Originator:    <andreast@gcc.gnu.org> 20030828     */
>> +
> 
> The above is not from me, I know, nitpicking.

Patches welcome.  :-)

>> Index: lib/libffi-dg.exp
>> ===================================================================
>> --- lib/libffi-dg.exp    (revision 148170)
>> +++ lib/libffi-dg.exp    (working copy)
>> @@ -16,7 +16,7 @@
>>
>>  proc load_gcc_lib { filename } {
>>      global srcdir
>> -    load_file $srcdir/../../gcc/testsuite/lib/$filename
>> +    load_file $srcdir/lib/$filename
>>  }
>>
>>  load_lib dg.exp
>> @@ -94,7 +94,6 @@
>>      global srcdir
>>      global blddirffi
>>      global objdir
>> -    global blddircxx
>>      global TOOL_OPTIONS
>>      global tool
>>      global libffi_include
>> @@ -102,10 +101,8 @@
>>      global tool_root_dir
>>      global ld_library_path
>>
>> -    set blddirffi [lookfor_file [get_multilibs] libffi]
>> +    set blddirffi [pwd]/..
>>      verbose "libffi $blddirffi"
>> -    set blddircxx [lookfor_file [get_multilibs] libstdc++-v3]
>> -    verbose "libstdc++ $blddircxx"
>>
>>      set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
>>      if {$gccdir != ""} {
>> @@ -132,8 +129,6 @@
>>      }
>>      # add the library path for libffi.
>>      append ld_library_path ":${blddirffi}/.libs"
>> -    # add the library path for libstdc++ as well.
>> -    append ld_library_path ":${blddircxx}/src/.libs"
>>
>>      verbose "ld_library_path: $ld_library_path"
>>
>> @@ -146,7 +141,6 @@
>>      if { $libffi_dir != "" } {
>>      set libffi_dir [file dirname ${libffi_dir}]
>>      set libffi_link_flags "-L${libffi_dir}/.libs"
>> -    lappend libffi_link_flags "-L${blddircxx}/src/.libs"
>>      }
>>
>>      set_ld_library_path_env_vars
> 
> 
> Do we really want that? As I remember we wanted to test against the
> built libraries from gcc. Also, we have multilib configs in gcc which
> will no longer be tested with the above, or not correctly.

Okay, so we will need to diverge the testsuite between libffi and gcc.  That's
perfectly okay, as long as we clearly mark the section **** DO NOT MERGE ***
Or something...

>> Index: Makefile.am
>> ===================================================================
>> --- Makefile.am    (revision 148170)
>> +++ Makefile.am    (working copy)
>> @@ -14,3 +14,58 @@
>>  AM_RUNTESTFLAGS =
>>
>>  CLEANFILES = *.exe core* *.log *.sum
>> +
>> +EXTRA_DIST = config/default.exp lib/libffi-dg.exp     
> 
> Hm, do we distribute other testfiles with gcc when we install it?

I dunno why this stuff is in EXTRA_DIST.  Anthony?

Andrew.



More information about the Java-patches mailing list