Clean ups

patches/stand-alone

@@ -34560,63 +34560,6 @@ Index: libffi/texinfo.tex
 +@ignore
 +   arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115
 +@end ignore
-Index: libffi/testsuite/lib/libffi-dg.exp
-===================================================================
---- libffi.orig/testsuite/lib/libffi-dg.exp
-+++ libffi/testsuite/lib/libffi-dg.exp
-@@ -11,12 +11,12 @@
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; see the file COPYING3.  If not see
--# <http://www.gnu.org/licenses/>.
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
- 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 @@ proc libffi-init { args } {
-     global srcdir
-     global blddirffi
-     global objdir
--    global blddircxx
-     global TOOL_OPTIONS
-     global tool
-     global libffi_include
-@@ -102,10 +101,8 @@ proc libffi-init { args } {
-     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 @@ proc libffi-init { args } {
-     }
-     # 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 @@ proc libffi-init { args } {
-     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
 Index: libffi/testsuite/lib/target-libpath.exp
 ===================================================================
 --- /dev/null
@@ -35080,7 +35023,7 @@ Index: libffi/testsuite/lib/libffi.exp
 +++ libffi/testsuite/lib/libffi.exp
 @@ -1,4 +1,4 @@
 -#   Copyright (C) 2003, 2005, 2008, 2009, 2010 Free Software Foundation, Inc.
-+#   Copyright (C) 2003, 2005, 2008-2011 Free Software Foundation, Inc.
++#   Copyright (C) 2003, 2005, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
@@ -35106,7 +35049,7 @@ Index: libffi/testsuite/lib/libffi.exp
      global ld_library_path
  
 -    set blddirffi [lookfor_file [get_multilibs] libffi]
-+    set blddirffi [pwd]/..
++    set blddirffi [pwd]/.. 
      verbose "libffi $blddirffi"
 -    set blddircxx [lookfor_file [get_multilibs] libstdc++-v3]
 -    verbose "libstdc++ $blddircxx"