From d27e6fd532200873fe8cc23a155360114fe26110 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@elastic.org>
Date: Tue, 25 Aug 2009 11:54:15 -0400
Subject: 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".
---
 tapset/syscalls2.stp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tapset/syscalls2.stp')

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)
 %:
-- 
cgit