]> granicus.if.org Git - strace/blobdiff - Makefile.am
Add support for specifying compiler options for mpers builds
[strace] / Makefile.am
index 2ddb6e2d97876fb0026d6bc747c8275d0139dd98..dd1536c5ce73aa83332d971fd6503c088cd7eab7 100644 (file)
@@ -4,6 +4,7 @@
 # Copyright (c) 2006-2016 Dmitry V. Levin <ldv@altlinux.org>
 # Copyright (c) 2008-2015 Mike Frysinger <vapier@gentoo.org>
 # Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com>
+# Copyright (c) 2002-2017 The strace developers.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,16 +35,18 @@ endif
 if HAVE_MX32_RUNTIME
 TESTS_MX32 = tests-mx32
 endif
-SUBDIRS = tests $(TESTS_M32) $(TESTS_MX32)
+SUBDIRS = tests $(TESTS_M32) $(TESTS_MX32)
 
 bin_PROGRAMS = strace
-man_MANS = strace.1
+man_MANS = strace.1 strace-log-merge.1
 bin_SCRIPTS = strace-graph strace-log-merge
 
 OS             = linux
 # ARCH is `i386', `m68k', `sparc', etc.
 ARCH           = @arch@
 
+READELF                = @READELF@
+
 ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS = -I$(builddir)/$(OS)/$(ARCH) \
@@ -53,6 +56,9 @@ AM_CPPFLAGS = -I$(builddir)/$(OS)/$(ARCH) \
              -I$(builddir) \
              -I$(srcdir)
 
+AM_CFLAGS_FOR_BUILD = $(WARN_CFLAGS_FOR_BUILD)
+AM_CPPFLAGS_FOR_BUILD = $(AM_CPPFLAGS)
+
 include xlat/Makemodule.am
 
 strace_CPPFLAGS = $(AM_CPPFLAGS)
@@ -67,6 +73,7 @@ libstrace_a_SOURCES = \
        fstatfs.c \
        fstatfs64.c \
        ipc.c \
+       sigreturn.c     \
        socketcall.c \
        statfs.c \
        statfs64.c \
@@ -81,9 +88,16 @@ strace_SOURCES =     \
        affinity.c      \
        aio.c           \
        alpha.c         \
+       basic_filters.c \
+       bind.c          \
        bjm.c           \
        block.c         \
        bpf.c           \
+       bpf_filter.c    \
+       bpf_filter.h    \
+       bpf_fprog.h     \
+       bpf_seccomp_filter.c \
+       bpf_sock_filter.c \
        btrfs.c         \
        cacheflush.c    \
        capability.c    \
@@ -99,8 +113,11 @@ strace_SOURCES =    \
        dirent.c        \
        dirent64.c      \
        dm.c            \
+       dyxlat.c        \
        empty.h         \
        epoll.c         \
+       error_prints.c  \
+       error_prints.h  \
        evdev.c         \
        eventfd.c       \
        execve.c        \
@@ -109,8 +126,9 @@ strace_SOURCES =    \
        fanotify.c      \
        fchownat.c      \
        fcntl.c         \
-       fetch_seccomp_fprog.c \
+       fetch_bpf_fprog.c \
        fetch_struct_flock.c \
+       fetch_struct_keyctl_kdf_params.c \
        fetch_struct_mmsghdr.c \
        fetch_struct_msghdr.c \
        fetch_struct_stat.c \
@@ -118,9 +136,11 @@ strace_SOURCES =   \
        fetch_struct_statfs.c \
        file_handle.c   \
        file_ioctl.c    \
-       fs_x_ioctl.c    \
+       filter_qualify.c \
+       filter.h        \
        flock.c         \
        flock.h         \
+       fs_x_ioctl.c    \
        futex.c         \
        gcc_compat.h    \
        get_robust_list.c \
@@ -145,14 +165,18 @@ strace_SOURCES =  \
        kernel_types.h  \
        kexec.c         \
        keyctl.c        \
+       keyctl_kdf_params.h \
+       kvm.c \
        ldt.c           \
        link.c          \
        linux/asm_stat.h \
        linux/x32/asm_stat.h \
        linux/x86_64/asm_stat.h \
+       listen.c        \
        lookup_dcookie.c \
        loop.c          \
        lseek.c         \
+       macros.h        \
        mem.c           \
        membarrier.c    \
        memfd_create.c  \
@@ -165,9 +189,29 @@ strace_SOURCES =   \
        msghdr.h        \
        mtd.c           \
        native_defs.h   \
+       negated_errno.h \
        net.c           \
        netlink.c       \
+       netlink.h       \
+       netlink_crypto.c \
+       netlink_sock_diag.h \
+       netlink_inet_diag.c \
+       netlink_netlink_diag.c \
+       netlink_packet_diag.c \
+       netlink_route.c \
+       netlink_route.h \
+       netlink_selinux.c \
+       netlink_smc_diag.c \
+       netlink_sock_diag.c \
+       netlink_unix_diag.c \
+       nlattr.c        \
+       nlattr.h        \
+       nsfs.c          \
+       nsfs.h          \
+       nsig.h          \
        numa.c          \
+       number_set.c    \
+       number_set.h    \
        oldstat.c       \
        open.c          \
        or1k_atomic.c   \
@@ -178,8 +222,13 @@ strace_SOURCES =   \
        pkeys.c         \
        poll.c          \
        prctl.c         \
+       print_dev_t.c   \
+       print_group_req.c \
+       print_fields.h  \
+       print_ifindex.c \
        print_mq_attr.c \
        print_msgbuf.c  \
+       print_sg_req_info.c \
        print_sigevent.c \
        print_statfs.c  \
        print_struct_stat.c \
@@ -195,7 +244,6 @@ strace_SOURCES =    \
        process_vm.c    \
        ptp.c           \
        ptrace.h        \
-       qualify.c       \
        quota.c         \
        readahead.c     \
        readlink.c      \
@@ -203,17 +251,34 @@ strace_SOURCES =  \
        regs.h          \
        renameat.c      \
        resource.c      \
+       rt_sigframe.c   \
+       rt_sigreturn.c  \
        rtc.c           \
+       rtnl_addr.c     \
+       rtnl_addrlabel.c \
+       rtnl_dcb.c      \
+       rtnl_link.c     \
+       rtnl_mdb.c      \
+       rtnl_neigh.c    \
+       rtnl_neightbl.c \
+       rtnl_netconf.c  \
+       rtnl_nsid.c     \
+       rtnl_route.c    \
+       rtnl_rule.c     \
+       rtnl_tc.c       \
+       rtnl_tc_action.c \
        sched.c         \
+       sched_attr.h    \
        scsi.c          \
        seccomp.c       \
-       seccomp_fprog.h \
        sendfile.c      \
+       sg_io_v3.c      \
+       sg_io_v4.c      \
+       shutdown.c      \
        sigaltstack.c   \
        sigevent.h      \
        signal.c        \
        signalfd.c      \
-       sigreturn.c     \
        sock.c          \
        sockaddr.c      \
        socketutils.c   \
@@ -223,33 +288,46 @@ strace_SOURCES =  \
        stat64.c        \
        statfs.c        \
        statfs.h        \
+       statx.c         \
+       statx.h         \
        strace.c        \
+       string_to_uint.h \
+       string_to_uint.c \
+       supported_personalities.h \
        swapon.c        \
        syscall.c       \
        sysctl.c        \
+       sysent.h        \
+       sysent_shorthand_defs.h \
+       sysent_shorthand_undefs.h \
        sysinfo.c       \
        syslog.c        \
        sysmips.c       \
        term.c          \
        time.c          \
        times.c         \
+       trace_event.h   \
        truncate.c      \
        ubi.c           \
+       ucopy.c         \
        uid.c           \
        uid16.c         \
        umask.c         \
        umount.c        \
        uname.c         \
        userfaultfd.c   \
+       ustat.c         \
        util.c          \
        utime.c         \
        utimes.c        \
        v4l2.c          \
-       vsprintf.c      \
        wait.c          \
        xattr.c         \
+       xlat.c          \
        xlat.h          \
        xmalloc.c       \
+       xmalloc.h       \
+       xstring.h       \
        # end of strace_SOURCES
 
 if USE_LIBUNWIND
@@ -257,6 +335,11 @@ strace_SOURCES += unwind.c
 strace_CPPFLAGS += $(libunwind_CPPFLAGS)
 strace_LDFLAGS += $(libunwind_LDFLAGS)
 strace_LDADD += $(libunwind_LIBS)
+if USE_DEMANGLE
+strace_CPPFLAGS += $(libiberty_CPPFLAGS)
+strace_LDFLAGS += $(libiberty_LDFLAGS)
+strace_LDADD += $(libiberty_LIBS)
+endif
 endif
 
 @CODE_COVERAGE_RULES@
@@ -266,7 +349,7 @@ CODE_COVERAGE_GENHTML_OPTIONS = $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) \
 CODE_COVERAGE_IGNORE_PATTERN = '/usr/include/*'
 strace_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS)
 strace_CFLAGS += $(CODE_COVERAGE_CFLAGS)
-strace_LDADD += $(CODE_COVERAGE_LDFLAGS)
+strace_LDADD += $(CODE_COVERAGE_LIBS)
 
 # Enable this to get link map generated
 #strace_LDFLAGS += -Wl,-Map=strace.mapfile
@@ -293,8 +376,8 @@ EXTRA_DIST =                                \
        debian/strace64.install         \
        debian/strace64.manpages        \
        debian/watch                    \
-       errnoent.sh                     \
        generate_sen.sh                 \
+       ioctl_iocdef.c                  \
        ioctlsort.c                     \
        linux/32/ioctls_inc.h           \
        linux/32/ioctls_inc_align16.h   \
@@ -305,6 +388,7 @@ EXTRA_DIST =                                \
        linux/64/syscallent.h           \
        linux/aarch64/arch_regs.c       \
        linux/aarch64/arch_regs.h       \
+       linux/aarch64/arch_rt_sigframe.c\
        linux/aarch64/arch_sigreturn.c  \
        linux/aarch64/errnoent1.h       \
        linux/aarch64/get_error.c       \
@@ -322,6 +406,7 @@ EXTRA_DIST =                                \
        linux/alpha/arch_getrval2.c     \
        linux/alpha/arch_regs.c         \
        linux/alpha/arch_regs.h         \
+       linux/alpha/arch_rt_sigframe.c  \
        linux/alpha/arch_sigreturn.c    \
        linux/alpha/errnoent.h          \
        linux/alpha/get_error.c         \
@@ -336,6 +421,8 @@ EXTRA_DIST =                                \
        linux/alpha/syscallent.h        \
        linux/alpha/userent.h           \
        linux/arc/arch_regs.c           \
+       linux/arc/arch_regs.h           \
+       linux/arc/arch_rt_sigframe.c    \
        linux/arc/get_error.c           \
        linux/arc/get_scno.c            \
        linux/arc/get_syscall_args.c    \
@@ -344,10 +431,12 @@ EXTRA_DIST =                              \
        linux/arc/set_error.c           \
        linux/arc/set_scno.c            \
        linux/arc/syscallent.h          \
+       linux/arch_kvm.c                \
        linux/arch_regs.h               \
        linux/arch_sigreturn.c          \
        linux/arm/arch_regs.c           \
        linux/arm/arch_regs.h           \
+       linux/arm/arch_rt_sigframe.c    \
        linux/arm/arch_sigreturn.c      \
        linux/arm/get_error.c           \
        linux/arm/get_scno.c            \
@@ -359,6 +448,8 @@ EXTRA_DIST =                                \
        linux/arm/syscallent.h          \
        linux/arm/userent.h             \
        linux/avr32/arch_regs.c         \
+       linux/avr32/arch_regs.h         \
+       linux/avr32/arch_rt_sigframe.c  \
        linux/avr32/get_error.c         \
        linux/avr32/get_scno.c          \
        linux/avr32/get_syscall_args.c  \
@@ -369,32 +460,38 @@ EXTRA_DIST =                              \
        linux/avr32/syscallent.h        \
        linux/avr32/userent.h           \
        linux/bfin/arch_regs.c          \
+       linux/bfin/arch_rt_sigframe.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/rt_sigframe.h        \
        linux/bfin/set_error.c          \
        linux/bfin/set_scno.c           \
        linux/bfin/syscallent.h         \
        linux/bfin/userent.h            \
        linux/crisv10/arch_regs.c       \
+       linux/crisv10/arch_rt_sigframe.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/rt_sigframe.h     \
        linux/crisv10/set_error.c       \
        linux/crisv10/set_scno.c        \
        linux/crisv10/syscallent.h      \
        linux/crisv10/userent.h         \
        linux/crisv32/arch_regs.c       \
+       linux/crisv32/arch_rt_sigframe.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/rt_sigframe.h     \
        linux/crisv32/set_error.c       \
        linux/crisv32/set_scno.c        \
        linux/crisv32/syscallent.h      \
@@ -404,6 +501,7 @@ EXTRA_DIST =                                \
        linux/getregs_old.h             \
        linux/hppa/arch_regs.c          \
        linux/hppa/arch_regs.h          \
+       linux/hppa/arch_rt_sigframe.c   \
        linux/hppa/errnoent.h           \
        linux/hppa/get_error.c          \
        linux/hppa/get_scno.c           \
@@ -411,18 +509,22 @@ EXTRA_DIST =                              \
        linux/hppa/get_syscall_result.c \
        linux/hppa/ioctls_arch0.h       \
        linux/hppa/ioctls_inc0.h        \
+       linux/hppa/rt_sigframe.h        \
        linux/hppa/set_error.c          \
        linux/hppa/set_scno.c           \
        linux/hppa/signalent.h          \
        linux/hppa/syscallent.h         \
+       linux/i386/arch_kvm.c           \
        linux/i386/arch_regs.c          \
        linux/i386/arch_regs.h          \
+       linux/i386/arch_rt_sigframe.c   \
        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/rt_sigframe.h        \
        linux/i386/set_error.c          \
        linux/i386/set_scno.c           \
        linux/i386/syscallent.h         \
@@ -431,12 +533,13 @@ EXTRA_DIST =                              \
        linux/ia64/arch_getrval2.c      \
        linux/ia64/arch_regs.c          \
        linux/ia64/arch_regs.h          \
-       linux/ia64/arch_sigreturn.c     \
+       linux/ia64/arch_rt_sigframe.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/rt_sigframe.h        \
        linux/ia64/set_error.c          \
        linux/ia64/set_scno.c           \
        linux/ia64/syscallent.h         \
@@ -444,17 +547,21 @@ EXTRA_DIST =                              \
        linux/inet_diag.h               \
        linux/m68k/arch_regs.c          \
        linux/m68k/arch_regs.h          \
+       linux/m68k/arch_rt_sigframe.c   \
        linux/m68k/arch_sigreturn.c     \
        linux/m68k/get_error.c          \
        linux/m68k/get_scno.c           \
        linux/m68k/get_syscall_args.c   \
        linux/m68k/ioctls_arch0.h       \
        linux/m68k/ioctls_inc0.h        \
+       linux/m68k/rt_sigframe.h        \
        linux/m68k/set_error.c          \
        linux/m68k/set_scno.c           \
        linux/m68k/syscallent.h         \
        linux/m68k/userent.h            \
        linux/metag/arch_regs.c         \
+       linux/metag/arch_regs.h         \
+       linux/metag/arch_rt_sigframe.c  \
        linux/metag/get_error.c         \
        linux/metag/get_scno.c          \
        linux/metag/get_syscall_args.c  \
@@ -464,6 +571,7 @@ EXTRA_DIST =                                \
        linux/metag/set_scno.c          \
        linux/metag/syscallent.h        \
        linux/microblaze/arch_regs.c    \
+       linux/microblaze/arch_rt_sigframe.c\
        linux/microblaze/arch_sigreturn.c       \
        linux/microblaze/get_error.c    \
        linux/microblaze/get_scno.c     \
@@ -478,6 +586,7 @@ EXTRA_DIST =                                \
        linux/mips/arch_getrval2.c      \
        linux/mips/arch_regs.c          \
        linux/mips/arch_regs.h          \
+       linux/mips/arch_rt_sigframe.c   \
        linux/mips/arch_sigreturn.c     \
        linux/mips/errnoent.h           \
        linux/mips/genstub.sh           \
@@ -486,6 +595,7 @@ EXTRA_DIST =                                \
        linux/mips/get_syscall_args.c   \
        linux/mips/ioctls_arch0.h       \
        linux/mips/ioctls_inc0.h        \
+       linux/mips/rt_sigframe.h        \
        linux/mips/set_error.c          \
        linux/mips/set_scno.c           \
        linux/mips/signalent.h          \
@@ -495,9 +605,10 @@ EXTRA_DIST =                               \
        linux/mips/syscallent-o32.h     \
        linux/mips/syscallent.h         \
        linux/mips/userent.h            \
-       linux/mtd-abi.h                 \
        linux/netlink_diag.h            \
        linux/nios2/arch_regs.c         \
+       linux/nios2/arch_regs.h         \
+       linux/nios2/arch_rt_sigframe.c  \
        linux/nios2/get_error.c         \
        linux/nios2/get_scno.c          \
        linux/nios2/get_syscall_args.c  \
@@ -507,6 +618,8 @@ EXTRA_DIST =                                \
        linux/nios2/set_scno.c          \
        linux/nios2/syscallent.h        \
        linux/or1k/arch_regs.c          \
+       linux/or1k/arch_regs.h          \
+       linux/or1k/arch_rt_sigframe.c   \
        linux/or1k/get_error.c          \
        linux/or1k/get_scno.c           \
        linux/or1k/get_syscall_args.c   \
@@ -516,9 +629,10 @@ EXTRA_DIST =                               \
        linux/or1k/set_scno.c           \
        linux/or1k/syscallent.h         \
        linux/or1k/userent.h            \
-       linux/personality.h             \
+       linux/packet_diag.h             \
        linux/powerpc/arch_regs.c       \
        linux/powerpc/arch_regs.h       \
+       linux/powerpc/arch_rt_sigframe.c\
        linux/powerpc/arch_sigreturn.c  \
        linux/powerpc/errnoent.h        \
        linux/powerpc/get_error.c       \
@@ -534,6 +648,7 @@ EXTRA_DIST =                                \
        linux/powerpc/userent.h         \
        linux/powerpc64/arch_regs.c     \
        linux/powerpc64/arch_regs.h     \
+       linux/powerpc64/arch_rt_sigframe.c\
        linux/powerpc64/arch_sigreturn.c        \
        linux/powerpc64/errnoent.h      \
        linux/powerpc64/errnoent1.h     \
@@ -546,14 +661,16 @@ EXTRA_DIST =                              \
        linux/powerpc64/ioctls_arch1.h  \
        linux/powerpc64/ioctls_inc0.h   \
        linux/powerpc64/ioctls_inc1.h   \
+       linux/powerpc64/rt_sigframe.h   \
        linux/powerpc64/set_error.c     \
        linux/powerpc64/set_scno.c      \
        linux/powerpc64/signalent1.h    \
        linux/powerpc64/syscallent.h    \
        linux/powerpc64/syscallent1.h   \
        linux/powerpc64/userent.h       \
-       linux/ptp_clock.h               \
        linux/riscv/arch_regs.c         \
+       linux/riscv/arch_regs.h         \
+       linux/riscv/arch_rt_sigframe.c  \
        linux/riscv/errnoent1.h         \
        linux/riscv/get_error.c         \
        linux/riscv/get_scno.c          \
@@ -567,14 +684,17 @@ EXTRA_DIST =                              \
        linux/riscv/signalent1.h        \
        linux/riscv/syscallent.h        \
        linux/riscv/syscallent1.h       \
+       linux/rt_sigframe.h             \
        linux/s390/arch_regs.c          \
        linux/s390/arch_regs.h          \
+       linux/s390/arch_rt_sigframe.c   \
        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/rt_sigframe.h        \
        linux/s390/set_error.c          \
        linux/s390/set_scno.c           \
        linux/s390/syscallent.h         \
@@ -583,18 +703,21 @@ EXTRA_DIST =                              \
        linux/s390/userent1.h           \
        linux/s390x/arch_regs.c         \
        linux/s390x/arch_regs.h         \
+       linux/s390x/arch_rt_sigframe.c  \
        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/rt_sigframe.h       \
        linux/s390x/set_error.c         \
        linux/s390x/set_scno.c          \
        linux/s390x/syscallent.h        \
        linux/s390x/userent.h           \
        linux/sh/arch_getrval2.c        \
        linux/sh/arch_regs.c            \
+       linux/sh/arch_rt_sigframe.c     \
        linux/sh/get_error.c            \
        linux/sh/get_scno.c             \
        linux/sh/get_syscall_args.c     \
@@ -608,21 +731,25 @@ EXTRA_DIST =                              \
        linux/sh/userent0.h             \
        linux/sh64/arch_regs.c          \
        linux/sh64/arch_regs.h          \
+       linux/sh64/arch_rt_sigframe.c   \
        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/rt_sigframe.h        \
        linux/sh64/set_error.c          \
        linux/sh64/set_scno.c           \
        linux/sh64/syscallent.h         \
        linux/sh64/userent.h            \
        linux/signalent.h               \
+       linux/smc_diag.h                \
        linux/sock_diag.h               \
        linux/sparc/arch_getrval2.c     \
        linux/sparc/arch_regs.c         \
        linux/sparc/arch_regs.h         \
+       linux/sparc/arch_rt_sigframe.c  \
        linux/sparc/arch_sigreturn.c    \
        linux/sparc/errnoent.h          \
        linux/sparc/gen.pl              \
@@ -631,6 +758,7 @@ EXTRA_DIST =                                \
        linux/sparc/get_syscall_args.c  \
        linux/sparc/ioctls_arch0.h      \
        linux/sparc/ioctls_inc0.h       \
+       linux/sparc/rt_sigframe.h       \
        linux/sparc/set_error.c         \
        linux/sparc/set_scno.c          \
        linux/sparc/signalent.h         \
@@ -639,6 +767,7 @@ EXTRA_DIST =                                \
        linux/sparc64/arch_getrval2.c   \
        linux/sparc64/arch_regs.c       \
        linux/sparc64/arch_regs.h       \
+       linux/sparc64/arch_rt_sigframe.c\
        linux/sparc64/arch_sigreturn.c  \
        linux/sparc64/errnoent.h        \
        linux/sparc64/errnoent1.h       \
@@ -649,6 +778,7 @@ EXTRA_DIST =                                \
        linux/sparc64/ioctls_arch1.h    \
        linux/sparc64/ioctls_inc0.h     \
        linux/sparc64/ioctls_inc1.h     \
+       linux/sparc64/rt_sigframe.h     \
        linux/sparc64/set_error.c       \
        linux/sparc64/set_scno.c        \
        linux/sparc64/signalent.h       \
@@ -660,6 +790,7 @@ EXTRA_DIST =                                \
        linux/syscall.h                 \
        linux/tile/arch_regs.c          \
        linux/tile/arch_regs.h          \
+       linux/tile/arch_rt_sigframe.c   \
        linux/tile/arch_sigreturn.c     \
        linux/tile/errnoent1.h          \
        linux/tile/get_error.c          \
@@ -669,18 +800,20 @@ EXTRA_DIST =                              \
        linux/tile/ioctls_arch1.h       \
        linux/tile/ioctls_inc0.h        \
        linux/tile/ioctls_inc1.h        \
+       linux/tile/rt_sigframe.h        \
        linux/tile/set_error.c          \
        linux/tile/set_scno.c           \
        linux/tile/signalent1.h         \
        linux/tile/syscallent.h         \
        linux/tile/syscallent1.h        \
        linux/tile/userent.h            \
-       linux/ubi-user.h                \
        linux/unix_diag.h               \
        linux/userent.h                 \
        linux/userent0.h                \
+       linux/x32/arch_kvm.c            \
        linux/x32/arch_regs.c           \
        linux/x32/arch_regs.h           \
+       linux/x32/arch_rt_sigframe.c    \
        linux/x32/arch_sigreturn.c      \
        linux/x32/errnoent1.h           \
        linux/x32/get_error.c           \
@@ -690,14 +823,17 @@ EXTRA_DIST =                              \
        linux/x32/ioctls_arch1.h        \
        linux/x32/ioctls_inc0.h         \
        linux/x32/ioctls_inc1.h         \
+       linux/x32/rt_sigframe.h         \
        linux/x32/set_error.c           \
        linux/x32/set_scno.c            \
        linux/x32/signalent1.h          \
        linux/x32/syscallent.h          \
        linux/x32/syscallent1.h         \
        linux/x32/userent.h             \
+       linux/x86_64/arch_kvm.c         \
        linux/x86_64/arch_regs.c        \
        linux/x86_64/arch_regs.h        \
+       linux/x86_64/arch_rt_sigframe.c \
        linux/x86_64/arch_sigreturn.c   \
        linux/x86_64/errnoent1.h        \
        linux/x86_64/errnoent2.h        \
@@ -713,6 +849,7 @@ EXTRA_DIST =                                \
        linux/x86_64/ioctls_inc0.h      \
        linux/x86_64/ioctls_inc1.h      \
        linux/x86_64/ioctls_inc2.h      \
+       linux/x86_64/rt_sigframe.h      \
        linux/x86_64/set_error.c        \
        linux/x86_64/set_scno.c         \
        linux/x86_64/signalent1.h       \
@@ -722,6 +859,7 @@ EXTRA_DIST =                                \
        linux/x86_64/syscallent2.h      \
        linux/x86_64/userent.h          \
        linux/xtensa/arch_regs.c        \
+       linux/xtensa/arch_rt_sigframe.c \
        linux/xtensa/get_error.c        \
        linux/xtensa/get_scno.c         \
        linux/xtensa/get_syscall_args.c \
@@ -732,25 +870,22 @@ EXTRA_DIST =                              \
        linux/xtensa/set_scno.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                   \
        mpers_xlat.h                    \
-       signalent.sh                    \
+       scno.head                       \
        strace-graph                    \
        strace-log-merge                \
        strace.spec                     \
-       syscallent.sh                   \
-       valgrind.supp                   \
        $(XLAT_INPUT_FILES)             \
        $(XLAT_HEADER_FILES)            \
        xlat/gen.sh                     \
        xlate.el
 
+.PHONY: check-valgrind-local
+check-valgrind-local:
+
 .PHONY: srpm
 srpm: dist-xz
        rpmbuild --define '%_srcrpmdir .' -ts $(distdir).tar.xz
@@ -777,6 +912,8 @@ sen.h: $(patsubst %,$(srcdir)/%,$(syscallent_files))
 
 dist-hook:
        $(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
+       ${AM_V_GEN}echo $(COPYRIGHT_YEAR) > $(distdir)/.year
+       ${AM_V_GEN}echo $(MANPAGE_DATE) > $(distdir)/.strace.1.in.date
 
 today = $(shell date +%Y-%m-%d)
 version_regexp = $(subst .,\.,$(VERSION))
@@ -794,9 +931,9 @@ news-check: NEWS
 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)
+ioctlsort_CPPFLAGS = $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD)
+ioctlsort_CFLAGS = $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
+ioctlsort_LDFLAGS = $(AM_LDFLAGS_FOR_BUILD) $(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))
@@ -813,10 +950,19 @@ ioctl_redefs%.h: ioctlent%.h ioctlent0.h
 ioctlent%.h: ioctlsort%
        ./$< > $@
 
+# Need to pick up <linux/ioctl.h> definitions *for host* while compiling
+# ioctlsort *for build*, hence this magic.
+ioctl_iocdef.i: $(srcdir)/ioctl_iocdef.c
+       $(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+               $(strace_CPPFLAGS) $(CPPFLAGS) $< -o $@
+
+ioctl_iocdef.h: ioctl_iocdef.i
+       sed -n 's/^DEFINE HOST/#define /p' $< > $@
+
 ioctlsort%$(BUILD_EXEEXT): ioctlsort%.o
        $(ioctlsort_CC) $(ioctlsort_CFLAGS) $(ioctlsort_LDFLAGS) $< -o $@
 
-ioctlsort%.o: ioctls_all%.h $(srcdir)/ioctlsort.c
+ioctlsort%.o: ioctls_all%.h ioctl_iocdef.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
@@ -825,9 +971,14 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioc
 BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
                native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h .version
 CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
+               ioctl_iocdef.h ioctl_iocdef.i \
                native_printer_decls.h native_printer_defs.h printers.h sen.h sys_func.h
 DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h
 
+include scno.am
+
+$(strace_OBJECTS): scno.h
+
 # defines mpers_source_files
 include mpers.am
 srcdir_mpers_source_files = $(patsubst %,$(srcdir)/%,$(mpers_source_files))
@@ -846,15 +997,18 @@ libmpers_CFLAGS = $(strace_CFLAGS)
 
 mpers-m%.stamp: $(srcdir_mpers_source_files) | printers.h
        for f in $^; do \
-               CC="$(CC)" CFLAGS="$(mpers_sh_opts) -DMPERS_IS_$(mpers_NAME)" \
-               CPP="$(CPP)" CPPFLAGS="$(mpers_sh_opts) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \
-               $(srcdir)/mpers.sh -$(mpers_NAME) $$f || exit; \
+               READELF="$(READELF)" \
+               CC="$(CC)" \
+               CFLAGS="$(mpers_sh_opts) -DMPERS_IS_$(mpers_NAME)" \
+               CPP="$(CPP)" \
+               CPPFLAGS="$(mpers_sh_opts) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \
+               $(srcdir)/mpers.sh $(mpers_NAME) $(mpers_CC_FLAGS) $$f || exit; \
        done
        > $@
 
 m%_type_defs.h: $(srcdir_mpers_source_files)
        for f in $^; do \
-               sed -r -n 's/^#include DEF_MPERS_TYPE\(([^)]+)\)/#ifdef MPERS_$(mpers_PREFIX)\1\n# define \1 MPERS_$(mpers_PREFIX)\1\n#endif/p' $$f || exit; \
+               sed -r -n 's/^#[[:space:]]*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
@@ -919,6 +1073,7 @@ BUILT_SOURCES += $(mpers_m32_targets)
 CLEANFILES    += $(mpers_m32_targets)
 
 $(mpers_m32_targets): mpers_NAME = m32
+$(mpers_m32_targets): mpers_CC_FLAGS = @cc_flags_m32@
 
 endif # HAVE_M32_MPERS
 
@@ -935,6 +1090,7 @@ BUILT_SOURCES += $(mpers_mx32_targets)
 CLEANFILES    += $(mpers_mx32_targets)
 
 $(mpers_mx32_targets): mpers_NAME = mx32
+$(mpers_mx32_targets): mpers_CC_FLAGS = @cc_flags_mx32@
 
 endif # HAVE_MX32_MPERS
 
@@ -961,10 +1117,9 @@ $(srcdir)/CREDITS: $(srcdir)/CREDITS.in $(srcdir)/.mailmap \
        (                                                               \
          cd $(srcdir);                                                 \
          sed '/^##/,$$d' CREDITS.in;                                   \
-         { sed -n '1,/^##>/d; s/   */\t/; s/^./&/p' CREDITS.in;        \
-           git log --pretty=format:'%aN        %aE';                   \
-         } | LC_ALL=C sort -u                                          \
-           | awk -F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}';             \
+         sed -n '1,/^##>/d; s/   */\t/; s/^./&/p' CREDITS.in           \
+           | maint/gen-contributors-list.sh - -e HEAD --initial        \
+           | sed 's/\t/ /g; s/^/\t/'                                   \
        ) > $@-t && mv $@-t $@
 
 export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner --mode=go-w,go+rX