PR18162: map aarch64->arm64 for stap-server -a use

There are two "uname -m" -> linux $ARCH mappings
in the source tree.  They got out of whack for aarch64.
They are now back in whack.

+  # NB: see also util.cxx (normalize_machine)
+  // NB repeated: see also stap-env (stap_get_arch)

diff --git a/stap-env b/stap-env
index ca15c0810b691343e648faef12a10673fc36d2b9..c65c3f654840149b8701e5e9c243d433993fb6f4 100755 (executable)
--- a/stap-env
+++ b/stap-env
@@ -37,7 +37,7 @@ function stap_get_arch {
   # to squash uname -m -> $(SUBARCH).
   #
   # This logic needs to match the logic in the systemtap_session
-  # constructor in session.cxx.
+  # constructor in util.cxx (normalize_machine)
 
   local machine=`uname -m`
   case $machine in
@@ -46,11 +46,13 @@ function stap_get_arch {
       arm*) machine="arm" ;;
       sa1*) machine="arm" ;;
       s390*) machine="s390" ;;
+      aarch64) machine="arm64" ;;
       ppc*) machine="powerpc" ;;
       mips*) machine="mips" ;;
       sh?) machine="sh" ;;
       # the default is to just use the output of 'uname -m'
   esac
-
+  # NB: see also util.cxx (normalize_machine)
+  
   echo $machine
 }

diff --git a/util.cxx b/util.cxx
index 1e53c6c6ca016297699fa495d3b269b27b670590..0b61668df96136d23589052a9cd8034998b6858a 100644 (file)
--- a/util.cxx
+++ b/util.cxx
@@ -1015,7 +1015,8 @@ normalize_machine(const string& machine)
   // But: RHBZ669082 reminds us that this renaming post-dates some
   // of the kernel versions we know and love.  So in buildrun.cxx
   // we undo this renaming for ancient powerpc.
-
+  //
+  // NB repeated: see also stap-env (stap_get_arch)
   if (machine == "i486") return "i386";
   else if (machine == "i586") return "i386";
   else if (machine == "i686") return "i386";
@@ -1029,6 +1030,7 @@ normalize_machine(const string& machine)
   else if (machine.substr(0,3) == "sh2") return "sh";
   else if (machine.substr(0,3) == "sh3") return "sh";
   else if (machine.substr(0,3) == "sh4") return "sh";
+  // NB repeated: see also stap-env (stap_get_arch)
   return machine;
 }