stap-server: export x86-64 machine code to avahi sysinfo

* stap-env (stap_get_arch): Simplify.  Abort on unknown machine
  instead of letting "unknown" value propagate.

diff --git a/stap-env b/stap-env
index b02e96b639c774cf0cc99f7db643c4b1555dd524..a74621e862e22f4e63482931ce40c663e48101da 100755 (executable)
--- a/stap-env
+++ b/stap-env
@@ -48,21 +48,17 @@ function stap_get_arch {
   # to squash uname -m -> $(SUBARCH).
 
   local machine=`uname -m`
-  machine=`expr "$machine" : '\(...\).*'`
   case $machine in
-      i48) machine="i386" ;;
-      i58) machine="i386" ;;
-      i68) machine="i386" ;;
+      i?86) machine="i386" ;;
+      x86_64) machine="x86_64" ;;
       sun) machine="sparc64" ;;
-      arm) machine="arm" ;;
-      sa1) machine="arm" ;;
-      s39) machine="s390" ;;
-      ppc) machine="powerpc" ;;
-      mip) machine="mips" ;;
-      sh2) machine="sh" ;;
-      sh3) machine="sh" ;;
-      sh4) machine="sh" ;;
-      *)   machine="unknown" ;;
+      arm*) machine="arm" ;;
+      sa1*) machine="arm" ;;
+      s390*) machine="s390" ;;
+      ppc*) machine="powerpc" ;;
+      mip*) machine="mips" ;;
+      sh?) machine="sh" ;;
+      *)   echo "unknown machine $machine" 1>&1; exit 1 ;; 
   esac
 
   echo $machine