Merged revisions 7995-7996,8084 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r7995 | Almindor | 2007-07-09 23:09:26 +0200 (Mon, 09 Jul 2007) | 2 lines

* exchange "arch" with "uname -m" in samplecfg to work on non-linux

........
r7996 | Almindor | 2007-07-09 23:14:59 +0200 (Mon, 09 Jul 2007) | 2 lines

* adds amd64 to the list of uname -m possible results in samplecfg

........
r8084 | joost | 2007-07-17 19:39:35 +0200 (Tue, 17 Jul 2007) | 1 line

 * Replaced "uname m" from which the output was not very consistent with "fpc -PP"
........

git-svn-id: branches/fixes_2_2@8095 -

compiler/utils/samplecfg

@@ -125,8 +125,8 @@ esac
 CPUCROSSIFDEF1="#DEFINE NEEDCROSSBINUTILS"
 CPUCROSSIFDEF2=""
 
-case `arch` in
-  i?86|x86_64)
+case `fpc -PP` in
+  i?86|x86_64|amd64)
     # Cross-binutils are not needed to compile for i386 on an x86_64 system
     CPUCROSSIFDEF1="
 #IFNDEF CPUI386