]> granicus.if.org Git - strace/commitdiff
sparc64: fix decoding of mknod and mknodat syscalls for sparc personality
authorDmitry V. Levin <ldv@altlinux.org>
Fri, 25 Mar 2016 23:48:48 +0000 (23:48 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Fri, 25 Mar 2016 23:48:48 +0000 (23:48 +0000)
Remove remnants of solaris personality support in mknod parser
that resulted to sparc personality being decoded as old solaris
personality.  This complements commit v4.10-45-gdf4dd8b and fixes
commit v4.10-46-g588a90f.

* mknod.c (decode_mknod) [SPARC || SPARC64]: Remove.

mknod.c

diff --git a/mknod.c b/mknod.c
index ca19068fcaad2dccc3fd460f1555bf5b401a78ba..14d9ddd74d78a2f0a96f31468d22e2fd525d2f23 100644 (file)
--- a/mknod.c
+++ b/mknod.c
@@ -54,14 +54,7 @@ decode_mknod(struct tcb *tcp, int offset)
        switch (mode & S_IFMT) {
        case S_IFCHR:
        case S_IFBLK:
-#if defined(SPARC) || defined(SPARC64)
-               if (current_personality == 1)
-                       tprintf(", makedev(%lu, %lu)",
-                       (unsigned long) ((tcp->u_arg[offset + 2] >> 18) & 0x3fff),
-                       (unsigned long) (tcp->u_arg[offset + 2] & 0x3ffff));
-               else
-#endif /* SPARC || SPARC64 */
-                       tprintf(", makedev(%lu, %lu)",
+               tprintf(", makedev(%lu, %lu)",
                        (unsigned long) major(tcp->u_arg[offset + 2]),
                        (unsigned long) minor(tcp->u_arg[offset + 2]));
                break;