From ef2c8aa97309d9f5801263cad46585dffd85610e Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Tue, 1 Nov 2005 17:26:50 +0000 Subject: [PATCH] Added code for linux-x86_64. --- startup/EpicsHostArch | 11 +++++++---- startup/EpicsHostArch.pl | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/startup/EpicsHostArch b/startup/EpicsHostArch index 934681bba..150e00345 100755 --- a/startup/EpicsHostArch +++ b/startup/EpicsHostArch @@ -24,12 +24,15 @@ sysname=`uname` case $sysname in Linux ) os=linux - cpu=`uname -m` + cpu=`uname -m` case $cpu in i386 | i486 | i586 | i686 ) cpu=x86 ;; esac - echo ${os}-${cpu}${suffix} + if [ ${cpu} = "x86_64" ]; then + cpu=x86_64 + fi + echo ${os}-${cpu}${suffix} ;; Darwin ) os=darwin @@ -50,8 +53,8 @@ case $sysname in ;; OSF1 ) os=osf - cpu=`uname -m` - echo ${os}-${cpu}${suffix} + cpu=`uname -m` + echo ${os}-${cpu}${suffix} ;; SunOS ) version=`uname -r | sed '1s/^\([0-9]*\).*$/\1/'` diff --git a/startup/EpicsHostArch.pl b/startup/EpicsHostArch.pl index 561c86765..b6de5a215 100755 --- a/startup/EpicsHostArch.pl +++ b/startup/EpicsHostArch.pl @@ -28,6 +28,7 @@ sub GetEpicsHostArch { # no args } elsif ($arch =~ m/i86pc-solaris/) { return "solaris-x86"; } elsif ($arch =~ m/sun4-sunos/) { return "sun4-68k"; } elsif ($arch =~ m/i[3-6]86-linux/) { return "linux-x86"; + } elsif ($arch =~ m/x86_64-linux/) { return "linux-x86_64"; } elsif ($arch =~ m/MSWin32-x86/) { return "win32-x86"; } elsif ($arch =~ m/cygwin/) { return "cygwin-x86"; } elsif ($arch =~ m/PA-RISC1.1/) { return "hpux-parisc";