io.c: use printaddr and umove_or_printaddr

[strace] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 04506bce1cb1cd2bc5788cb88f27cd774811804d..95672bd80b864313b411b11818f89a6a5c2f6add 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,6 +77,9 @@ strace_SOURCES =      \
        personality.c   \
        prctl.c         \
        printmode.c     \
+       printrusage.c   \
+       printsiginfo.c  \
+       printsiginfo.h  \
        printstat.h     \
        process.c       \
        process_vm.c    \
@@ -89,9 +92,11 @@ strace_SOURCES =     \
        regs.h          \
        renameat.c      \
        resource.c      \
+       rtc.c           \
        sched.c         \
        scsi.c          \
        seccomp.c       \
+       sigaltstack.c   \
        signal.c        \
        sigreturn.c     \
        sock.c          \
@@ -121,7 +126,8 @@ strace_SOURCES =    \
        v4l2.c          \
        vsprintf.c      \
        wait.c          \
-       xattr.c
+       xattr.c         \
+       xmalloc.c
 
 if USE_LIBUNWIND
 strace_SOURCES += unwind.c
@@ -159,8 +165,11 @@ 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           \
@@ -319,6 +328,7 @@ EXTRA_DIST =                                \
        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     \
@@ -338,6 +348,14 @@ EXTRA_DIST =                               \
        linux/mips/syscallent.h         \
        linux/mips/userent.h            \
        linux/mtd-abi.h                 \
+       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           \
@@ -433,47 +451,35 @@ EXTRA_DIST =                              \
        linux/sparc/arch_regs.c         \
        linux/sparc/arch_regs.h         \
        linux/sparc/arch_sigreturn.c    \
-       linux/sparc/dummy2.h            \
        linux/sparc/errnoent.h          \
-       linux/sparc/errnoent1.h         \
        linux/sparc/gen.pl              \
        linux/sparc/get_error.c         \
        linux/sparc/get_scno.c          \
        linux/sparc/get_syscall_args.c  \
-       linux/sparc/ioctlent1.h         \
        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/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/dummy2.h          \
        linux/sparc64/errnoent.h        \
        linux/sparc64/errnoent1.h       \
-       linux/sparc64/errnoent2.h       \
        linux/sparc64/get_error.c       \
        linux/sparc64/get_scno.c        \
        linux/sparc64/get_syscall_args.c\
-       linux/sparc64/ioctlent1.h       \
        linux/sparc64/ioctls_arch0.h    \
-       linux/sparc64/ioctls_arch2.h    \
+       linux/sparc64/ioctls_arch1.h    \
        linux/sparc64/ioctls_inc0.h     \
-       linux/sparc64/ioctls_inc2.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                 \
@@ -564,11 +570,27 @@ EXTRA_DIST =                              \
 srpm: dist-xz
        rpmbuild --define '%_srcrpmdir .' -ts $(distdir).tar.xz
 
-BUILT_SOURCES = .version
+BUILT_SOURCES = .version sys_func.h sen.h
 
 $(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
 
@@ -595,7 +617,7 @@ 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))
 BUILT_SOURCES += $(ioctlent_h)
-CLEANFILES = $(ioctlent_h)
+CLEANFILES = sys_func.h sen.h $(ioctlent_h)
 
 ioctlent%.h: ioctlsort%
        ./$< > $@