[gcc] GCC 4.5.0=>4.5.1

gcc/gcc/testsuite/gcc.misc-tests/linkage.exp

Index: gcc/gcc/testsuite/gcc.misc-tests/linkage.exp
diff --git a/gcc/gcc/testsuite/gcc.misc-tests/linkage.exp b/gcc/gcc/testsuite/gcc.misc-tests/linkage.exp
index 33945bc6e3a0c7103fd3ef62dc5d9b6e0064841f..954dc29a50e4d413590ab6ff5e5c40f6330f3b7a 100644
--- a/gcc/gcc/testsuite/gcc.misc-tests/linkage.exp
+++ b/gcc/gcc/testsuite/gcc.misc-tests/linkage.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1988, 90-96, 1997, 2000, 2001, 2002, 2007, 2008
+# Copyright (C) 1988, 90-96, 1997, 2000, 2001, 2002, 2007, 2008, 2010
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -40,15 +40,18 @@ if { [isnative] && ![is_remote host] } then {
 		set native_cflags "-n32"
 	    }
 	}
-	if  [istarget "mips-sgi-iris6*o32" ] {
-	    set native_cflags "-32"
-	}
 	if  [istarget "sparc*-sun-solaris2*"] {
 	    set file_string [exec file "linkage-x.o"]
 	    if [ string match "*64*" $file_string ] {
 		set native_cflags "-xarch=v9"
 	    }
 	}
+	if  [istarget "i?86*-*-solaris2*"] {
+	    set file_string [exec file "linkage-x.o"]
+	    if [ string match "*64*" $file_string ] {
+		set native_cflags "-xarch=amd64"
+	    }
+	}
 	if [istarget "s390*-*-linux*"] {
 	    set file_string [exec file "linkage-x.o"]
 	    if [ string match "*32-bit*" $file_string ] {
@@ -57,11 +60,14 @@ if { [isnative] && ![is_remote host] } then {
 	    if [ string match "*64-bit*" $file_string ] {
 		set native_cflags "-m64"
 	    }
-	} elseif [istarget "x86_64-*-linux*"] {
+	} elseif {[istarget "i*86-*-linux*"] || [istarget "x86_64-*-linux*"]} {
 	    set file_string [exec file "linkage-x.o"]
 	    if [ string match "*32-bit*" $file_string ] {
 		set native_cflags "-m32"
 	    }
+	    if [ string match "*64-bit*" $file_string ] {
+		set native_cflags "-m64"
+	    }
 	} elseif [istarget "*-hp-hpux*"] {
 	    set file_string [exec file "linkage-x.o"]
 	    if [ string match "*ELF-64*" $file_string ] {