From d27e6fd532200873fe8cc23a155360114fe26110 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" 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". --- tapsets.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tapsets.cxx') diff --git a/tapsets.cxx b/tapsets.cxx index 5952ddcb..04fbf6e0 100644 --- a/tapsets.cxx +++ b/tapsets.cxx @@ -1559,6 +1559,7 @@ validate_module_elf (Dwfl_Module *mod, const char *name, base_query *q) string expect_machine; // to match sess.machine (i.e., kernel machine) string expect_machine2; + // NB: See also the 'uname -m' squashing done in main.cxx. switch (elf_machine) { // x86 and ppc are bi-architecture; a 64-bit kernel @@ -1579,7 +1580,7 @@ validate_module_elf (Dwfl_Module *mod, const char *name, base_query *q) break; case EM_S390: expect_machine = "s390x"; break; case EM_IA_64: expect_machine = "ia64"; break; - case EM_ARM: expect_machine = "armv*"; break; + case EM_ARM: expect_machine = "arm*"; break; // XXX: fill in some more of these default: expect_machine = "?"; break; } -- cgit