PR4186 cont'd: option #2: standardize on kernel ARCH/SUBARCH throughout

* main.cxx (main): Perform equivalent sed by hand on uname()->machine.
* stap.1.in: Clarify -a ARCH slightly.
* tapsets.cxx (validate_module_elf): Accept "arm*"for EM_ARM.
* tapset/**, testsuite/**: Removed/collapsed "i386"/"i686" branches,
  renamed "ppc64"->"powerpc" and "s390x"->"s390".

9 files changed, 12 insertions, 12 deletions

diff --git a/tapset/nd_syscalls2.stp b/tapset/nd_syscalls2.stp
index c93bf9f7..6e50d256 100644
--- a/tapset/nd_syscalls2.stp
+++ b/tapset/nd_syscalls2.stp
@@ -337,7 +337,7 @@ probe nd_syscall.pipe = kprobe.function("SyS_pipe") ?,
 %:
 	// fildes_uaddr = $fildes
 	// argstr = _fildes_u($fildes)
-	%( arch != "ppc64" %? asmlinkage() %)
+	%( arch != "powerpc" %? asmlinkage() %)
 	fildes_uaddr = pointer_arg(1)
 	argstr = _fildes_u(fildes_uaddr)
 %)
@@ -663,7 +663,7 @@ probe nd_syscall.pwrite32 = kprobe.function("sys32_pwrite64") ?
 	// buf_uaddr = $buf
 	// count = $count
 	// offset = ($poshi << 32) + $poslo
-// %( arch == "s390x" %?
+// %( arch == "s390" %?
     //     buf_uaddr = $ubuf
     //     argstr = sprintf("%d, %s, %d, %d", $fd,
     //                     text_strn(user_string($ubuf), syscall_string_trunc, 1),
@@ -870,7 +870,7 @@ probe nd_syscall.readv = kprobe.function("compat_sys_readv") ?,
 	// vector_uaddr = $vec
 	// count = $vlen
 /* FIXME: RHEL4 U3 ppc64 can't resolve $fd */
-// %( arch != "ppc64" %?
+// %( arch != "powerpc" %?
 	// fd = $fd
 	// argstr = sprintf("%d, %p, %d", $fd, $vec, $vlen)
 // %:
@@ -2974,7 +2974,7 @@ probe nd_syscall.sigaction = kprobe.function("sys_sigaction") ?
 	// act_uaddr = $act
 	// oact_uaddr = $oact
 	// argstr = sprintf("%s, {%s}, %p", _signal_name($sig), _struct_sigaction_u($act), $oact)
-	%( arch != "ppc64" %? asmlinkage() %)
+	%( arch != "powerpc" %? asmlinkage() %)
 	sig = int_arg(1)
 	act_uaddr = pointer_arg(2)
 	oact_uaddr = pointer_arg(3)
@@ -3994,7 +3994,7 @@ probe nd_syscall.uname = kprobe.function("sys_uname") ?,
 	_func_name = probefunc()
 	if (_func_name != "sys32_uname") {
 		if (_func_name == "sys_uname" || _func_name == "sys_olduname") {
-			%( arch != "ppc64" %? asmlinkage() %)
+			%( arch != "powerpc" %? asmlinkage() %)
 		} else
 			asmlinkage()
 	}
@@ -4465,7 +4465,7 @@ probe nd_syscall.writev = kprobe.function("compat_sys_writev") ?,
 	// vector_uaddr = $vec
 	// count = $vlen
 /* FIXME: RHEL4 U3 ppc64 can't resolve $fd */
-// %( arch != "ppc64" %?
+// %( arch != "powerpc" %?
     // fd = $fd
 	// argstr = sprintf("%d, %p, %d", $fd, $vec, $vlen)
 // %:
diff --git a/tapset/ppc64/nd_syscalls.stp b/tapset/powerpc/nd_syscalls.stp
index 46267507..46267507 100644
--- a/tapset/ppc64/nd_syscalls.stp
+++ b/tapset/powerpc/nd_syscalls.stp
diff --git a/tapset/ppc64/registers.stp b/tapset/powerpc/registers.stp
index c8713e5a..c8713e5a 100644
--- a/tapset/ppc64/registers.stp
+++ b/tapset/powerpc/registers.stp
diff --git a/tapset/ppc64/syscalls.stp b/tapset/powerpc/syscalls.stp
index 0518d486..0518d486 100644
--- a/tapset/ppc64/syscalls.stp
+++ b/tapset/powerpc/syscalls.stp
diff --git a/tapset/s390x/nd_syscalls.stp b/tapset/s390/nd_syscalls.stp
index 63435265..bd5f5c32 100644
--- a/tapset/s390x/nd_syscalls.stp
+++ b/tapset/s390/nd_syscalls.stp
@@ -1,6 +1,6 @@
 # S390-specific system calls
 
-%(arch == "s390x" %?
+%(arch == "s390" %?
 
 # getresgid __________________________________________________
 # long sys32_getresgid16(u16 __user *rgid, u16 __user *egid, u16 __user *sgid)
diff --git a/tapset/s390x/registers.stp b/tapset/s390/registers.stp
index 79482b73..79482b73 100644
--- a/tapset/s390x/registers.stp
+++ b/tapset/s390/registers.stp
diff --git a/tapset/s390x/syscalls.stp b/tapset/s390/syscalls.stp
index 94e07adf..aba7d6bf 100644
--- a/tapset/s390x/syscalls.stp
+++ b/tapset/s390/syscalls.stp
@@ -1,6 +1,6 @@
 # S390-specific system calls
 
-%(arch == "s390x" %?
+%(arch == "s390" %?
 
 # getresgid __________________________________________________
 # long sys32_getresgid16(u16 __user *rgid, u16 __user *egid, u16 __user *sgid)
diff --git a/tapset/scheduler.stp b/tapset/scheduler.stp
index 55e230c2..45ddbb04 100644
--- a/tapset/scheduler.stp
+++ b/tapset/scheduler.stp
@@ -131,7 +131,7 @@ probe scheduler.ctxswitch =
 	kernel.function("context_switch")
 %)
 {
-%( arch == "ppc64" %?
+%( arch == "powerpc" %?
         prev_pid = $prev->pid
         next_pid =  $new->pid
         prev_task = $prev
diff --git a/tapset/syscalls2.stp b/tapset/syscalls2.stp
index e97082c7..defc50a0 100644
--- a/tapset/syscalls2.stp
+++ b/tapset/syscalls2.stp
@@ -567,7 +567,7 @@ probe syscall.pwrite32 = kernel.function("sys32_pwrite64") ?
 	buf_uaddr = $buf
 	count = $count
 	offset = ($poshi << 32) + $poslo
-%( arch == "s390x" %?
+%( arch == "s390" %?
 	buf_uaddr = $ubuf
 	argstr = sprintf("%d, %s, %d, %d", $fd,
 		text_strn(user_string($ubuf), syscall_string_trunc, 1),
@@ -740,7 +740,7 @@ probe syscall.readv = kernel.function("compat_sys_readv") ?,
 	vector_uaddr = $vec
 	count = $vlen
 /* FIXME: RHEL4 U3 ppc64 can't resolve $fd */
-%( arch != "ppc64" %?
+%( arch != "powerpc" %?
 	fd = $fd
 	argstr = sprintf("%d, %p, %d", $fd, $vec, $vlen)
 %:
@@ -3696,7 +3696,7 @@ probe syscall.writev = kernel.function("compat_sys_writev") ?,
 	vector_uaddr = $vec
 	count = $vlen
 /* FIXME: RHEL4 U3 ppc64 can't resolve $fd */
-%( arch != "ppc64" %?
+%( arch != "powerpc" %?
 	fd = $fd
 	argstr = sprintf("%d, %p, %d", $fd, $vec, $vlen)
 %: