From af8da8dfba4729488b298d50d2daf8ca7ccbb821 Mon Sep 17 00:00:00 2001 From: janis Date: Tue, 2 Dec 2008 18:48:04 +0000 Subject: [PATCH] 2008-12-02 Jack Howarth * gcc.misc-tests/linkage.exp: Correct file type check for Darwin. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142371 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.misc-tests/linkage.exp | 15 +++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a08d83b5b33..77b69ee59a2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2008-12-02 Jack Howarth + + * gcc.misc-tests/linkage.exp: Correct file type check for Darwin. + 2008-12-02 Jakub Jelinek PR middle-end/38343 diff --git a/gcc/testsuite/gcc.misc-tests/linkage.exp b/gcc/testsuite/gcc.misc-tests/linkage.exp index dc051a0a2ea..85aadb3daf7 100644 --- a/gcc/testsuite/gcc.misc-tests/linkage.exp +++ b/gcc/testsuite/gcc.misc-tests/linkage.exp @@ -73,14 +73,21 @@ if { [isnative] && ![is_remote host] } then { } elseif [ string match "*32-bit*" $file_string ] { set native_cflags "-m32" } - } elseif [istarget "*-*-darwin*"] { + } elseif [istarget "powerpc*-*-darwin*"] { set file_string [exec file "linkage-x.o"] - if [ string match "*64-bit*" $file_string ] { + if [ string match "*ppc64" $file_string ] { set native_cflags "-m64" - } elseif [ string match "*32-bit*" $file_string ] { + } elseif [ string match "*ppc" $file_string ] { set native_cflags "-m32" } - } + } elseif [istarget "*86*-*-darwin*"] { + set file_string [exec file "linkage-x.o"] + if [ string match "*x86_64" $file_string ] { + set native_cflags "-m64" + } elseif [ string match "*i386" $file_string ] { + set native_cflags "-m32" + } + } if [file exists "linkage-y.o"] then { file delete "linkage-y.o" -- 2.11.4.GIT