]> granicus.if.org Git - strace/blobdiff - Makefile.am
Move parser of struct sigevent to a separate file
[strace] / Makefile.am
index 97266f056ab238264aaacffd4fb3bc8df7353fab..2870f5dbd02247a0d97a673b821e43db7dc97084 100644 (file)
@@ -1,6 +1,12 @@
 # Automake input for strace.
 
-SUBDIRS = tests
+if HAVE_M32_RUNTIME
+TESTS_M32 = tests-m32
+endif
+if HAVE_MX32_RUNTIME
+TESTS_MX32 = tests-mx32
+endif
+SUBDIRS = tests $(TESTS_M32) $(TESTS_MX32)
 
 bin_PROGRAMS = strace
 man_MANS = strace.1
@@ -12,55 +18,115 @@ ARCH               = @arch@
 
 ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = $(WARN_CFLAGS)
-AM_CPPFLAGS = -I$(srcdir)/$(OS)/$(ARCH) -I$(srcdir)/$(OS) -I$(builddir)/$(OS)
+AM_CPPFLAGS = -I$(builddir)/$(OS)/$(ARCH) \
+             -I$(srcdir)/$(OS)/$(ARCH) \
+             -I$(builddir)/$(OS) \
+             -I$(srcdir)/$(OS) \
+             -I$(builddir) \
+             -I$(srcdir)
 
 include xlat/Makemodule.am
 
+strace_CPPFLAGS = $(AM_CPPFLAGS)
+strace_LDFLAGS =
+strace_LDADD =
+noinst_LIBRARIES =
+
 strace_SOURCES =       \
+       access.c        \
+       affinity.c      \
        aio.c           \
        bjm.c           \
        block.c         \
+       bpf.c           \
        cacheflush.c    \
        capability.c    \
+       caps0.h         \
+       caps1.h         \
        chdir.c         \
        chmod.c         \
-       chown.c         \
+       clone.c         \
        count.c         \
        desc.c          \
        dirent.c        \
+       empty.h         \
+       epoll.c         \
+       evdev.c         \
+       eventfd.c       \
+       execve.c        \
+       exit.c          \
        fadvise.c       \
        fallocate.c     \
        fanotify.c      \
+       fchownat.c      \
        file.c          \
+       futex.c         \
+       get_robust_list.c \
+       getcpu.c        \
        getcwd.c        \
+       getrandom.c     \
+       hostname.c      \
        inotify.c       \
        io.c            \
        ioctl.c         \
        ioprio.c        \
-       ipc.c           \
+       ipc_defs.h      \
+       ipc_msg.c       \
+       ipc_msgctl.c    \
+       ipc_sem.c       \
+       ipc_shm.c       \
+       ipc_shmctl.c    \
        kexec.c         \
        keyctl.c        \
        ldt.c           \
        link.c          \
        loop.c          \
+       lseek.c         \
        mem.c           \
+       memfd_create.c  \
        mknod.c         \
        mount.c         \
+       mpers_type.h    \
+       mq.c            \
        mtd.c           \
+       native_defs.h   \
        net.c           \
+       open.c          \
        or1k_atomic.c   \
        pathtrace.c     \
+       perf.c          \
        personality.c   \
+       poll.c          \
+       prctl.c         \
+       print_mq_attr.c \
+       print_msgbuf.c  \
+       print_sigevent.c \
+       print_time.c    \
        printmode.c     \
+       printrusage.c   \
+       printsiginfo.c  \
+       printsiginfo.h  \
+       printstat.h     \
        process.c       \
+       process_vm.c    \
        ptp.c           \
+       ptrace.h        \
        quota.c         \
+       readahead.c     \
        readlink.c      \
        reboot.c        \
+       regs.h          \
        renameat.c      \
        resource.c      \
+       rtc.c           \
+       sched.c         \
        scsi.c          \
+       seccomp.c       \
+       sendfile.c      \
+       sigaltstack.c   \
        signal.c        \
+       signalfd.c      \
+       sigreturn.c     \
        sock.c          \
        socketutils.c   \
        sram_alloc.c    \
@@ -76,22 +142,28 @@ strace_SOURCES =   \
        sysmips.c       \
        term.c          \
        time.c          \
+       times.c         \
        truncate.c      \
+       uid.c           \
+       uid16.c         \
+       umask.c         \
        umount.c        \
+       uname.c         \
        util.c          \
        utime.c         \
        utimes.c        \
        v4l2.c          \
        vsprintf.c      \
-       xattr.c
+       wait.c          \
+       xattr.c         \
+       xmalloc.c       \
+       # end of strace_SOURCES
 
 if USE_LIBUNWIND
 strace_SOURCES += unwind.c
-strace_CPPFLAGS = $(AM_CPPFLAGS) $(libunwind_CPPFLAGS)
-strace_LDFLAGS = $(libunwind_LDFLAGS)
-strace_LDADD = $(libunwind_LIBS)
-else
-strace_CPPFLAGS = $(AM_CPPFLAGS)
+strace_CPPFLAGS += $(libunwind_CPPFLAGS)
+strace_LDFLAGS += $(libunwind_LDFLAGS)
+strace_LDADD += $(libunwind_LIBS)
 endif
 
 noinst_HEADERS = defs.h
@@ -105,7 +177,6 @@ EXTRA_DIST =                                \
        CREDITS                         \
        ChangeLog                       \
        ChangeLog-CVS                   \
-       README-linux                    \
        README-linux-ptrace             \
        debian/changelog                \
        debian/compat                   \
@@ -122,135 +193,400 @@ EXTRA_DIST =                            \
        debian/strace64.manpages        \
        debian/watch                    \
        errnoent.sh                     \
+       generate_sen.sh                 \
        ioctlsort.c                     \
+       linux/32/ioctls_inc.h           \
+       linux/32/ioctls_inc_align32.h   \
+       linux/32/ioctls_inc_align64.h   \
+       linux/32/syscallent.h           \
+       linux/64/ioctls_inc.h           \
+       linux/64/syscallent.h           \
+       linux/aarch64/arch_regs.c       \
+       linux/aarch64/arch_regs.h       \
+       linux/aarch64/arch_sigreturn.c  \
        linux/aarch64/errnoent1.h       \
-       linux/aarch64/ioctlent.h.in     \
-       linux/aarch64/ioctlent1.h       \
+       linux/aarch64/get_error.c       \
+       linux/aarch64/get_scno.c        \
+       linux/aarch64/get_syscall_args.c\
+       linux/aarch64/ioctls_arch0.h    \
+       linux/aarch64/ioctls_arch1.h    \
+       linux/aarch64/ioctls_inc0.h     \
+       linux/aarch64/ioctls_inc1.h     \
+       linux/aarch64/print_pc.c        \
        linux/aarch64/signalent1.h      \
        linux/aarch64/syscallent.h      \
        linux/aarch64/syscallent1.h     \
+       linux/alpha/arch_getrval2.c     \
+       linux/alpha/arch_regs.c         \
+       linux/alpha/arch_regs.h         \
+       linux/alpha/arch_sigreturn.c    \
        linux/alpha/errnoent.h          \
-       linux/alpha/ioctlent.h.in       \
+       linux/alpha/get_error.c         \
+       linux/alpha/get_scno.c          \
+       linux/alpha/get_syscall_args.c  \
+       linux/alpha/get_syscall_result.c\
+       linux/alpha/ioctls_arch0.h      \
+       linux/alpha/ioctls_inc0.h       \
+       linux/alpha/print_pc.c          \
        linux/alpha/signalent.h         \
        linux/alpha/syscallent.h        \
-       linux/arc/ioctlent.h.in         \
+       linux/alpha/userent.h           \
+       linux/arc/arch_regs.c           \
+       linux/arc/get_error.c           \
+       linux/arc/get_scno.c            \
+       linux/arc/get_syscall_args.c    \
+       linux/arc/ioctls_arch0.h        \
+       linux/arc/ioctls_inc0.h         \
+       linux/arc/print_pc.c            \
        linux/arc/syscallent.h          \
-       linux/arm/ioctlent.h.in         \
+       linux/arch_regs.h               \
+       linux/arch_sigreturn.c          \
+       linux/arm/arch_regs.c           \
+       linux/arm/arch_regs.h           \
+       linux/arm/arch_sigreturn.c      \
+       linux/arm/get_error.c           \
+       linux/arm/get_scno.c            \
+       linux/arm/get_syscall_args.c    \
+       linux/arm/ioctls_arch0.h        \
+       linux/arm/ioctls_inc0.h         \
+       linux/arm/print_pc.c            \
        linux/arm/syscallent.h          \
-       linux/avr32/ioctlent.h.in       \
+       linux/arm/userent.h             \
+       linux/avr32/arch_regs.c         \
+       linux/avr32/get_error.c         \
+       linux/avr32/get_scno.c          \
+       linux/avr32/get_syscall_args.c  \
+       linux/avr32/ioctls_arch0.h      \
+       linux/avr32/ioctls_inc0.h       \
+       linux/avr32/print_pc.c          \
        linux/avr32/syscallent.h        \
-       linux/bfin/ioctlent.h.in        \
+       linux/avr32/userent.h           \
+       linux/bfin/arch_regs.c          \
+       linux/bfin/get_error.c          \
+       linux/bfin/get_scno.c           \
+       linux/bfin/get_syscall_args.c   \
+       linux/bfin/get_syscall_result.c \
+       linux/bfin/ioctls_arch0.h       \
+       linux/bfin/ioctls_inc0.h        \
+       linux/bfin/print_pc.c           \
        linux/bfin/syscallent.h         \
+       linux/bfin/userent.h            \
+       linux/crisv10/arch_regs.c       \
+       linux/crisv10/arch_sigreturn.c  \
+       linux/crisv10/get_error.c       \
+       linux/crisv10/get_scno.c        \
+       linux/crisv10/get_syscall_args.c        \
+       linux/crisv10/get_syscall_result.c      \
+       linux/crisv10/print_pc.c        \
+       linux/crisv10/userent.h         \
+       linux/crisv32/arch_regs.c       \
+       linux/crisv32/arch_sigreturn.c  \
+       linux/crisv32/get_error.c       \
+       linux/crisv32/get_scno.c        \
+       linux/crisv32/get_syscall_args.c        \
+       linux/crisv32/get_syscall_result.c      \
+       linux/crisv32/print_pc.c        \
+       linux/crisv32/userent.h         \
        linux/dummy.h                   \
        linux/errnoent.h                \
-       linux/fanotify.h                \
+       linux/hppa/arch_regs.c          \
+       linux/hppa/arch_regs.h          \
        linux/hppa/errnoent.h           \
-       linux/hppa/ioctlent.h.in        \
+       linux/hppa/get_error.c          \
+       linux/hppa/get_scno.c           \
+       linux/hppa/get_syscall_args.c   \
+       linux/hppa/get_syscall_result.c \
+       linux/hppa/ioctls_arch0.h       \
+       linux/hppa/ioctls_inc0.h        \
+       linux/hppa/print_pc.c           \
        linux/hppa/signalent.h          \
        linux/hppa/syscallent.h         \
-       linux/i386/ioctlent.h.in        \
+       linux/i386/arch_regs.c          \
+       linux/i386/arch_regs.h          \
+       linux/i386/arch_sigreturn.c     \
+       linux/i386/get_error.c          \
+       linux/i386/get_scno.c           \
+       linux/i386/get_syscall_args.c   \
+       linux/i386/ioctls_arch0.h       \
+       linux/i386/ioctls_inc0.h        \
+       linux/i386/print_pc.c           \
        linux/i386/syscallent.h         \
-       linux/ia64/ioctlent.h.in        \
-       linux/ia64/signalent.h          \
+       linux/i386/userent.h            \
+       linux/i386/userent0.h           \
+       linux/ia64/arch_getrval2.c      \
+       linux/ia64/arch_regs.c          \
+       linux/ia64/arch_regs.h          \
+       linux/ia64/arch_sigreturn.c     \
+       linux/ia64/get_error.c          \
+       linux/ia64/get_scno.c           \
+       linux/ia64/get_syscall_args.c   \
+       linux/ia64/ioctls_arch0.h       \
+       linux/ia64/ioctls_inc0.h        \
+       linux/ia64/print_pc.c           \
        linux/ia64/syscallent.h         \
+       linux/ia64/userent.h            \
        linux/inet_diag.h               \
-       linux/inotify.h                 \
-       linux/ioctlent.h.in             \
-       linux/ioctlent.sh               \
-       linux/kexec.h                   \
-       linux/keyctl.h                  \
-       linux/m68k/ioctlent.h.in        \
+       linux/m68k/arch_regs.c          \
+       linux/m68k/arch_sigreturn.c     \
+       linux/m68k/get_error.c          \
+       linux/m68k/get_scno.c           \
+       linux/m68k/get_syscall_args.c   \
+       linux/m68k/get_syscall_result.c \
+       linux/m68k/ioctls_arch0.h       \
+       linux/m68k/ioctls_inc0.h        \
+       linux/m68k/print_pc.c           \
        linux/m68k/syscallent.h         \
-       linux/metag/ioctlent.h.in       \
+       linux/m68k/userent.h            \
+       linux/metag/arch_regs.c         \
+       linux/metag/get_error.c         \
+       linux/metag/get_scno.c          \
+       linux/metag/get_syscall_args.c  \
+       linux/metag/ioctls_arch0.h      \
+       linux/metag/ioctls_inc0.h       \
+       linux/metag/print_pc.c          \
        linux/metag/syscallent.h        \
-       linux/microblaze/ioctlent.h.in  \
+       linux/microblaze/arch_regs.c    \
+       linux/microblaze/arch_sigreturn.c       \
+       linux/microblaze/get_error.c    \
+       linux/microblaze/get_scno.c     \
+       linux/microblaze/get_syscall_args.c     \
+       linux/microblaze/get_syscall_result.c   \
+       linux/microblaze/ioctls_arch0.h \
+       linux/microblaze/ioctls_inc0.h  \
+       linux/microblaze/print_pc.c     \
        linux/microblaze/syscallent.h   \
+       linux/microblaze/userent.h      \
+       linux/mips/arch_getrval2.c      \
+       linux/mips/arch_regs.c          \
+       linux/mips/arch_regs.h          \
+       linux/mips/arch_sigreturn.c     \
        linux/mips/errnoent.h           \
-       linux/mips/ioctlent.h.in        \
-       linux/mips/ioctlent.sh          \
+       linux/mips/genstub.sh           \
+       linux/mips/get_error.c          \
+       linux/mips/get_scno.c           \
+       linux/mips/get_syscall_args.c   \
+       linux/mips/ioctls_arch0.h       \
+       linux/mips/ioctls_inc0.h        \
+       linux/mips/print_pc.c           \
        linux/mips/signalent.h          \
        linux/mips/syscallent-compat.h  \
        linux/mips/syscallent-n32.h     \
        linux/mips/syscallent-n64.h     \
        linux/mips/syscallent-o32.h     \
        linux/mips/syscallent.h         \
+       linux/mips/userent.h            \
        linux/mtd-abi.h                 \
-       linux/or1k/ioctlent.h.in        \
+       linux/nios2/arch_regs.c         \
+       linux/nios2/get_error.c         \
+       linux/nios2/get_scno.c          \
+       linux/nios2/get_syscall_args.c  \
+       linux/nios2/ioctls_arch0.h      \
+       linux/nios2/ioctls_inc0.h       \
+       linux/nios2/print_pc.c          \
+       linux/nios2/syscallent.h        \
+       linux/or1k/arch_regs.c          \
+       linux/or1k/get_error.c          \
+       linux/or1k/get_scno.c           \
+       linux/or1k/get_syscall_args.c   \
+       linux/or1k/ioctls_arch0.h       \
+       linux/or1k/ioctls_inc0.h        \
+       linux/or1k/print_pc.c           \
        linux/or1k/syscallent.h         \
+       linux/or1k/userent.h            \
        linux/personality.h             \
-       linux/powerpc/errnoent1.h       \
-       linux/powerpc/ioctlent.h.in     \
-       linux/powerpc/ioctlent1.h       \
-       linux/powerpc/signalent1.h      \
+       linux/powerpc/arch_regs.c       \
+       linux/powerpc/arch_regs.h       \
+       linux/powerpc/arch_sigreturn.c  \
+       linux/powerpc/errnoent.h        \
+       linux/powerpc/get_error.c       \
+       linux/powerpc/get_scno.c        \
+       linux/powerpc/get_syscall_args.c        \
+       linux/powerpc/getregs_old.c     \
+       linux/powerpc/ioctls_arch0.h    \
+       linux/powerpc/ioctls_inc0.h     \
+       linux/powerpc/print_pc.c        \
        linux/powerpc/syscallent.h      \
-       linux/powerpc/syscallent1.h     \
+       linux/powerpc/userent.h         \
+       linux/powerpc64/arch_regs.c     \
+       linux/powerpc64/arch_regs.h     \
+       linux/powerpc64/arch_sigreturn.c        \
+       linux/powerpc64/errnoent.h      \
+       linux/powerpc64/errnoent1.h     \
+       linux/powerpc64/get_error.c     \
+       linux/powerpc64/get_scno.c      \
+       linux/powerpc64/get_syscall_args.c      \
+       linux/powerpc64/getregs_old.c   \
+       linux/powerpc64/ioctls_arch0.h  \
+       linux/powerpc64/ioctls_arch1.h  \
+       linux/powerpc64/ioctls_inc0.h   \
+       linux/powerpc64/ioctls_inc1.h   \
+       linux/powerpc64/print_pc.c      \
+       linux/powerpc64/signalent1.h    \
+       linux/powerpc64/syscallent.h    \
+       linux/powerpc64/syscallent1.h   \
+       linux/powerpc64/userent.h       \
        linux/ptp_clock.h               \
-       linux/reboot.h                  \
-       linux/s390/ioctlent.h.in        \
+       linux/s390/arch_regs.c          \
+       linux/s390/arch_regs.h          \
+       linux/s390/arch_sigreturn.c     \
+       linux/s390/get_error.c          \
+       linux/s390/get_scno.c           \
+       linux/s390/get_syscall_args.c   \
+       linux/s390/ioctls_arch0.h       \
+       linux/s390/ioctls_inc0.h        \
+       linux/s390/print_pc.c           \
        linux/s390/syscallent.h         \
-       linux/s390x/ioctlent.h.in       \
+       linux/s390/userent.h            \
+       linux/s390/userent0.h           \
+       linux/s390/userent1.h           \
+       linux/s390x/arch_regs.c         \
+       linux/s390x/arch_regs.h         \
+       linux/s390x/arch_sigreturn.c    \
+       linux/s390x/get_error.c         \
+       linux/s390x/get_scno.c          \
+       linux/s390x/get_syscall_args.c  \
+       linux/s390x/ioctls_arch0.h      \
+       linux/s390x/ioctls_inc0.h       \
+       linux/s390x/print_pc.c          \
        linux/s390x/syscallent.h        \
-       linux/sh/ioctlent.h.in          \
+       linux/s390x/userent.h           \
+       linux/sh/arch_getrval2.c        \
+       linux/sh/arch_regs.c            \
+       linux/sh/get_error.c            \
+       linux/sh/get_scno.c             \
+       linux/sh/get_syscall_args.c     \
+       linux/sh/get_syscall_result.c   \
+       linux/sh/ioctls_arch0.h         \
+       linux/sh/ioctls_inc0.h          \
+       linux/sh/print_pc.c             \
        linux/sh/syscallent.h           \
-       linux/sh64/ioctlent.h.in        \
+       linux/sh/userent.h              \
+       linux/sh/userent0.h             \
+       linux/sh64/arch_regs.c          \
+       linux/sh64/arch_regs.h          \
+       linux/sh64/get_error.c          \
+       linux/sh64/get_scno.c           \
+       linux/sh64/get_syscall_args.c   \
+       linux/sh64/get_syscall_result.c \
+       linux/sh64/ioctls_arch0.h       \
+       linux/sh64/ioctls_inc0.h        \
+       linux/sh64/print_pc.c           \
        linux/sh64/syscallent.h         \
+       linux/sh64/userent.h            \
        linux/signalent.h               \
        linux/sock_diag.h               \
-       linux/sparc/dummy2.h            \
+       linux/sparc/arch_getrval2.c     \
+       linux/sparc/arch_regs.c         \
+       linux/sparc/arch_regs.h         \
+       linux/sparc/arch_sigreturn.c    \
        linux/sparc/errnoent.h          \
-       linux/sparc/errnoent1.h         \
        linux/sparc/gen.pl              \
-       linux/sparc/ioctlent.h.in       \
-       linux/sparc/ioctlent1.h         \
+       linux/sparc/get_error.c         \
+       linux/sparc/get_scno.c          \
+       linux/sparc/get_syscall_args.c  \
+       linux/sparc/ioctls_arch0.h      \
+       linux/sparc/ioctls_inc0.h       \
+       linux/sparc/print_pc.c          \
        linux/sparc/signalent.h         \
-       linux/sparc/signalent1.h        \
-       linux/sparc/syscall1.h          \
        linux/sparc/syscallent.h        \
-       linux/sparc/syscallent1.h       \
-       linux/sparc64/dummy2.h          \
+       linux/sparc/userent.h           \
+       linux/sparc64/arch_getrval2.c   \
+       linux/sparc64/arch_regs.c       \
+       linux/sparc64/arch_regs.h       \
+       linux/sparc64/arch_sigreturn.c  \
        linux/sparc64/errnoent.h        \
        linux/sparc64/errnoent1.h       \
-       linux/sparc64/errnoent2.h       \
-       linux/sparc64/ioctlent.h.in     \
-       linux/sparc64/ioctlent1.h       \
-       linux/sparc64/ioctlent2.h       \
+       linux/sparc64/get_error.c       \
+       linux/sparc64/get_scno.c        \
+       linux/sparc64/get_syscall_args.c\
+       linux/sparc64/ioctls_arch0.h    \
+       linux/sparc64/ioctls_arch1.h    \
+       linux/sparc64/ioctls_inc0.h     \
+       linux/sparc64/ioctls_inc1.h     \
+       linux/sparc64/print_pc.c        \
        linux/sparc64/signalent.h       \
        linux/sparc64/signalent1.h      \
-       linux/sparc64/signalent2.h      \
-       linux/sparc64/syscall1.h        \
        linux/sparc64/syscallent.h      \
        linux/sparc64/syscallent1.h     \
-       linux/sparc64/syscallent2.h     \
+       linux/sparc64/userent.h         \
        linux/subcall.h                 \
        linux/syscall.h                 \
+       linux/tile/arch_regs.c          \
+       linux/tile/arch_regs.h          \
+       linux/tile/arch_sigreturn.c     \
        linux/tile/errnoent1.h          \
-       linux/tile/ioctlent.h.in        \
-       linux/tile/ioctlent1.h          \
+       linux/tile/get_error.c          \
+       linux/tile/get_scno.c           \
+       linux/tile/get_syscall_args.c   \
+       linux/tile/ioctls_arch0.h       \
+       linux/tile/ioctls_arch1.h       \
+       linux/tile/ioctls_inc0.h        \
+       linux/tile/ioctls_inc1.h        \
+       linux/tile/print_pc.c           \
        linux/tile/signalent1.h         \
        linux/tile/syscallent.h         \
        linux/tile/syscallent1.h        \
+       linux/tile/userent.h            \
        linux/ubi-user.h                \
-       linux/x32/errnoent.h            \
+       linux/unix_diag.h               \
+       linux/userent.h                 \
+       linux/userent0.h                \
+       linux/x32/arch_regs.c           \
+       linux/x32/arch_regs.h           \
+       linux/x32/arch_sigreturn.c      \
        linux/x32/errnoent1.h           \
-       linux/x32/ioctlent.h.in         \
-       linux/x32/ioctlent1.h           \
-       linux/x32/signalent.h           \
+       linux/x32/get_error.c           \
+       linux/x32/get_scno.c            \
+       linux/x32/get_syscall_args.c    \
+       linux/x32/ioctls_arch0.h        \
+       linux/x32/ioctls_arch1.h        \
+       linux/x32/ioctls_inc0.h         \
+       linux/x32/ioctls_inc1.h         \
+       linux/x32/print_pc.c            \
        linux/x32/signalent1.h          \
        linux/x32/syscallent.h          \
        linux/x32/syscallent1.h         \
+       linux/x32/userent.h             \
+       linux/x86_64/arch_regs.c        \
+       linux/x86_64/arch_regs.h        \
+       linux/x86_64/arch_sigreturn.c   \
        linux/x86_64/errnoent1.h        \
        linux/x86_64/errnoent2.h        \
        linux/x86_64/gentab.pl          \
-       linux/x86_64/ioctlent.h.in      \
-       linux/x86_64/ioctlent1.h        \
-       linux/x86_64/ioctlent2.h        \
+       linux/x86_64/get_error.c        \
+       linux/x86_64/get_scno.c         \
+       linux/x86_64/get_syscall_args.c \
+       linux/x86_64/getregs_old.c      \
+       linux/x86_64/ioctls_arch0.h     \
+       linux/x86_64/ioctls_arch1.h     \
+       linux/x86_64/ioctls_arch2.h     \
+       linux/x86_64/ioctls_inc0.h      \
+       linux/x86_64/ioctls_inc1.h      \
+       linux/x86_64/ioctls_inc2.h      \
+       linux/x86_64/print_pc.c         \
        linux/x86_64/signalent1.h       \
        linux/x86_64/signalent2.h       \
        linux/x86_64/syscallent.h       \
        linux/x86_64/syscallent1.h      \
        linux/x86_64/syscallent2.h      \
-       linux/xtensa/ioctlent.h.in      \
+       linux/x86_64/userent.h          \
+       linux/xtensa/arch_regs.c        \
+       linux/xtensa/get_error.c        \
+       linux/xtensa/get_scno.c         \
+       linux/xtensa/get_syscall_args.c \
+       linux/xtensa/get_syscall_result.c       \
+       linux/xtensa/ioctls_arch0.h     \
+       linux/xtensa/ioctls_inc0.h      \
+       linux/xtensa/print_pc.c         \
        linux/xtensa/syscallent.h       \
+       linux/xtensa/userent.h          \
+       maint/ioctls_gen.sh             \
+       maint/ioctls_hex.sh             \
+       maint/ioctls_sym.sh             \
+       maint/print_ioctlent.c          \
+       mpers.awk                       \
+       mpers.sh                        \
+       mpers_test.sh                   \
        signalent.sh                    \
        strace-graph                    \
        strace-log-merge                \
@@ -265,11 +601,25 @@ EXTRA_DIST =                              \
 srpm: dist-xz
        rpmbuild --define '%_srcrpmdir .' -ts $(distdir).tar.xz
 
-BUILT_SOURCES = .version
-
 $(srcdir)/.version:
        $(AM_V_GEN)echo $(VERSION) > $@-t && mv $@-t $@
 
+strace_SOURCES_c = $(filter %.c,$(strace_SOURCES))
+
+sys_func.h: $(patsubst %,$(srcdir)/%,$(strace_SOURCES_c))
+       for f in $^; do \
+               sed -n 's/^SYS_FUNC(.*/extern &;/p' $$f; \
+       done | sort -u > $@
+
+syscallent_names = subcall.h syscallent.h syscallent1.h \
+                  syscallent-n32.h syscallent-n64.h syscallent-o32.h
+syscallent_patterns = $(patsubst %,\%/%,$(syscallent_names))
+syscallent_files = $(filter $(syscallent_patterns),$(EXTRA_DIST))
+
+sen.h: $(patsubst %,$(srcdir)/%,$(syscallent_files))
+       for f in $^; do cat -- $$f; done | \
+               $(srcdir)/generate_sen.sh > $@
+
 dist-hook:
        $(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
 
@@ -286,16 +636,131 @@ news-check: NEWS
                exit 1;                                         \
        fi
 
-ioctlent_h = $(builddir)/$(OS)/ioctlent.h
-BUILT_SOURCES += $(ioctlent_h)
-CLEANFILES = $(ioctlent_h)
-ioctlent_h_deps = $(srcdir)/$(OS)/ioctlent.h.in $(srcdir)/$(OS)/$(ARCH)/ioctlent.h.in
-$(ioctlent_h): $(top_builddir)/config.status $(ioctlent_h_deps)
-       $(MKDIR_P) $(builddir)/$(OS)
-       cat $(ioctlent_h_deps) | \
-               $(COMPILE) -E -P - | \
-               sed 's/^\([[:space:]]*{\)"[^"]\+",[[:space:]]*/\1/' | \
-               LC_ALL=C sort -u -k2,2 -k1,1 > $@
+ioctlsort_CC = $(CC_FOR_BUILD)
+ioctlsort_DEFS = $(DEFS)
+ioctlsort_INCLUDES = $(DEFAULT_INCLUDES) $(INCLUDES)
+ioctlsort_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD)
+ioctlsort_CFLAGS = $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
+ioctlsort_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD)
+
+ioctls_inc_h = $(wildcard $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h)
+ioctlent_h = $(patsubst $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%,ioctlent%,$(ioctls_inc_h))
+
+ioctlent%.h: ioctlsort%
+       ./$< > $@
+
+ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
+       $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
+
+ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
+       $(ioctlsort_CC) $(ioctlsort_DEFS) $(ioctlsort_INCLUDES) $(ioctlsort_CPPFLAGS) $(ioctlsort_CFLAGS) -DIOCTLSORT_INC=\"$<\" -c -o $@ $(srcdir)/ioctlsort.c
+
+ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioctls_arch%.h
+       cat $^ > $@
+
+BUILT_SOURCES = $(ioctlent_h) native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
+CLEANFILES    = $(ioctlent_h) native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
+DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
+
+# defines mpers_source_files
+include mpers.am
+srcdir_mpers_source_files = $(patsubst %,$(srcdir)/%,$(mpers_source_files))
+
+mpers_NAME =
+mpers_PREFIX = $(mpers_NAME)_
+mpers_DEFS = $(DEFS)
+mpers_INCLUDES = $(DEFAULT_INCLUDES) $(INCLUDES)
+mpers_CPPFLAGS = $(strace_CPPFLAGS) $(CPPFLAGS)
+mpers_sh_opts = $(mpers_DEFS) $(mpers_INCLUDES) $(mpers_CPPFLAGS)
+libmpers_CPPFLAGS = $(AM_CPPFLAGS) -DIN_MPERS
+
+# mpers targets
+
+mpers-m%.stamp: $(srcdir_mpers_source_files)
+       for f in $^; do \
+               CC="$(CC)" CFLAGS="$(mpers_sh_opts)" \
+               CPP="$(CPP)" CPPFLAGS="$(mpers_CPPFLAGS) $(mpers_INCLUDES) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \
+               $(srcdir)/mpers.sh -$(mpers_NAME) $$f || exit; \
+       done
+       > $@
+
+m%_defs.h: $(srcdir_mpers_source_files)
+       for f in $^; do \
+               sed -n 's/^#include DEF_MPERS_TYPE(\([^)]\+\))/#ifdef MPERS_$(mpers_PREFIX)\1\n# define \1 MPERS_$(mpers_PREFIX)\1\n#endif/p' $$f || exit; \
+       done > $@-t
+       echo '#undef MPERS_PRINTER_NAME' >> $@-t
+       echo '#define MPERS_PRINTER_NAME(printer_name) printer_name' >> $@-t
+       echo '#include "$(mpers_PREFIX)printer_decls.h"' >> $@-t
+       mv $@-t $@
+
+m%_funcs.h: $(srcdir_mpers_source_files)
+       for f in $^; do \
+               sed -n 's/^SYS_FUNC(\([^)]\+\))/#undef sys_\1\n#define sys_\1 $(mpers_PREFIX)sys_\1/p' $$f || exit; \
+       done > $@-t && \
+       echo '#include "sys_func.h"' >> $@-t
+       mv $@-t $@
+
+# printers
+
+printers.h: $(srcdir_mpers_source_files)
+       echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
+       echo 'typedef struct {' >> $@-t
+       for f in $^; do \
+               sed -n 's/^MPERS_PRINTER_DECL(\([^,]\+\),[[:space:]]*\([^)]\+\))\(.*\)/ \1 (*\2) \3;\n#define \2 MPERS_PRINTER_NAME(\2)\n/p' $$f || exit; \
+       done >> $@-t
+       echo '} struct_printers;' >> $@-t
+       echo 'extern const struct_printers *printers;' >> $@-t
+       echo '#define MPERS_PRINTER_NAME(printer_name) printers->printer_name' >> $@-t
+       mv $@-t $@
+
+%_printer_decls.h: $(srcdir_mpers_source_files)
+       echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
+       for f in $^; do \
+               sed -n 's/^MPERS_PRINTER_DECL(\([^,]\+\),[[:space:]]*\([^)]\+\))\(.*\)/extern \1 $(mpers_PREFIX)\2\3;/p' $$f || exit; \
+       done >> $@-t
+       mv $@-t $@
+
+%_printer_defs.h: $(srcdir_mpers_source_files)
+       echo '/* Generated by Makefile from $^; do not edit. */' > $@-t
+       for f in $^; do \
+               sed -n 's/^MPERS_PRINTER_DECL(\([^,]\+\),[[:space:]]*\([^)]\+\))\(.*\)/\.\2 = $(mpers_PREFIX)\2,/p' $$f || exit; \
+       done >> $@-t
+       mv $@-t $@
+
+native_printer_decls.h native_printer_defs.h: mpers_PREFIX =
+
+if HAVE_M32_MPERS
+
+strace_LDADD += libmpers-m32.a
+noinst_LIBRARIES += libmpers-m32.a
+libmpers_m32_a_SOURCES = $(mpers_source_files)
+libmpers_m32_a_CPPFLAGS = $(libmpers_CPPFLAGS) -DMPERS_IS_m32 -I$(builddir)/mpers-m32
+mpers_m32_targets = mpers-m32.stamp m32_defs.h m32_funcs.h m32_printer_decls.h m32_printer_defs.h
+
+BUILT_SOURCES += $(mpers_m32_targets)
+CLEANFILES    += $(mpers_m32_targets)
+
+$(mpers_m32_targets): mpers_NAME = m32
+
+endif # HAVE_M32_MPERS
+
+if HAVE_MX32_MPERS
+
+strace_LDADD += libmpers-mx32.a
+noinst_LIBRARIES += libmpers-mx32.a
+libmpers_mx32_a_SOURCES = $(mpers_source_files)
+libmpers_mx32_a_CPPFLAGS = $(libmpers_CPPFLAGS) -DMPERS_IS_mx32 -I$(builddir)/mpers-mx32
+mpers_mx32_targets = mpers-mx32.stamp mx32_defs.h mx32_funcs.h mx32_printer_decls.h mx32_printer_defs.h
+
+BUILT_SOURCES += $(mpers_mx32_targets)
+CLEANFILES    += $(mpers_mx32_targets)
+
+$(mpers_mx32_targets): mpers_NAME = mx32
+
+endif # HAVE_MX32_MPERS
+
+clean-local:
+       -rm -rf mpers-m32 mpers-mx32
 
 if MAINTAINER_MODE
 
@@ -325,28 +790,4 @@ $(srcdir)/CREDITS: $(srcdir)/CREDITS.in $(srcdir)/.mailmap \
 
 export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner --mode=go-w,go+rX
 
-INCLUDEDIR = /usr/include
-KERNEL_RELEASE = $(shell uname -r)
-# Candidates for the kernel headers tree.
-KERNEL_INCLUDE = \
-       /lib/modules/$(KERNEL_RELEASE)/build/include \
-       /usr/src/linux-$(KERNEL_RELEASE)/include \
-       $(INCLUDEDIR)
-IOCTLDIR = $(shell find $(KERNEL_INCLUDE) -maxdepth 0 -type d -print -quit 2>/dev/null)
-IOCTLASM = $(INCLUDEDIR)/asm
-
-noinst_PROGRAMS = ioctlsort
-ioctlsort_SOURCES = ioctlsort.c
-nodist_ioctlsort_SOURCES = ioctls.h ioctldefs.h
-CLEANFILES += $(nodist_ioctlsort_SOURCES)
-ioctlsort.$(OBJEXT): $(nodist_ioctlsort_SOURCES)
-ioctls.h: $(srcdir)/linux/ioctlent.sh
-       $(SHELL) $< $(IOCTLDIR) $(IOCTLASM)
-ioctldefs.h: ioctls.h ;
-
-ioctlent_h_in = linux/ioctlent.h.in
-BUILT_SOURCES += $(ioctlent_h_in)
-$(srcdir)/$(ioctlent_h_in): ioctlsort
-       $(<D)/$(<F) > $@
-
 endif