diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2009-08-25 11:54:15 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2009-08-25 12:31:14 -0400 |
| commit | d27e6fd532200873fe8cc23a155360114fe26110 (patch) | |
| tree | cb3644c25555116bcf3070251cb89362ffee3d8c /tapsets.cxx | |
| parent | f0a68636d44065dfd60e685924b82e95195c0f9f (diff) | |
| download | systemtap-steved-d27e6fd532200873fe8cc23a155360114fe26110.tar.gz systemtap-steved-d27e6fd532200873fe8cc23a155360114fe26110.tar.xz systemtap-steved-d27e6fd532200873fe8cc23a155360114fe26110.zip | |
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".
Diffstat (limited to 'tapsets.cxx')
| -rw-r--r-- | tapsets.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |