summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Keniston <jkenisto@us.ibm.com>2008-10-24 09:54:31 -0700
committerJim Keniston <jkenisto@us.ibm.com>2008-10-24 09:54:31 -0700
commit7635926c6d80eafc2f5f25326c3358521fccda02 (patch)
tree55624fa709a99eef7eaf62cc2dfb84bf3ad09e46
parentc57eb295b15067b8f7964c5e5bd798f1d31a36e5 (diff)
downloadsystemtap-steved-7635926c6d80eafc2f5f25326c3358521fccda02.tar.gz
systemtap-steved-7635926c6d80eafc2f5f25326c3358521fccda02.tar.xz
systemtap-steved-7635926c6d80eafc2f5f25326c3358521fccda02.zip
PR6946: Allow probing of 32-bit ppc apps with ppc64 kernels.
-rw-r--r--ChangeLog6
-rw-r--r--tapsets.cxx4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ac29d2ba..1f995a2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-24 Jim Keniston <jkenisto@us.ibm.com>
+
+ PR6946
+ * tapsets.cxx: Allow probing of 32-bit ppc apps with
+ a ppc64 kernel.
+
2008-10-20 Elliott Baron <ebaron@redhat.com>
PR6851
diff --git a/tapsets.cxx b/tapsets.cxx
index bed27967..a5cde7ce 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -3920,7 +3920,9 @@ validate_module_elf (Dwfl_Module *mod, const char *name, base_query *q)
{
case EM_386: expect_machine = "i?86"; break; // accept e.g. i586
case EM_X86_64: expect_machine = "x86_64"; break;
- case EM_PPC: expect_machine = "ppc"; break;
+ // We don't support 32-bit ppc kernels, but we support 32-bit apps
+ // running on ppc64 kernels.
+ case EM_PPC: expect_machine = "ppc64"; break;
case EM_PPC64: expect_machine = "ppc64"; break;
case EM_S390: expect_machine = "s390x"; break;
case EM_IA_64: expect_machine = "ia64"; break;