Add support for specifying compiler options for mpers builds

[strace] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 23ce121f55da39cef924482df9cb10a2d9726a7f..dd1536c5ce73aa83332d971fd6503c088cd7eab7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,13 +38,15 @@ endif
 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) \
@@ -126,6 +128,7 @@ strace_SOURCES =    \
        fcntl.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 \
@@ -162,6 +165,8 @@ strace_SOURCES =    \
        kernel_types.h  \
        kexec.c         \
        keyctl.c        \
+       keyctl_kdf_params.h \
+       kvm.c \
        ldt.c           \
        link.c          \
        linux/asm_stat.h \
@@ -194,6 +199,7 @@ strace_SOURCES =    \
        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 \
@@ -204,6 +210,8 @@ strace_SOURCES =    \
        nsfs.h          \
        nsig.h          \
        numa.c          \
+       number_set.c    \
+       number_set.h    \
        oldstat.c       \
        open.c          \
        or1k_atomic.c   \
@@ -246,6 +254,19 @@ strace_SOURCES =   \
        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          \
@@ -270,6 +291,9 @@ strace_SOURCES =    \
        statx.c         \
        statx.h         \
        strace.c        \
+       string_to_uint.h \
+       string_to_uint.c \
+       supported_personalities.h \
        swapon.c        \
        syscall.c       \
        sysctl.c        \
@@ -282,6 +306,7 @@ strace_SOURCES =    \
        term.c          \
        time.c          \
        times.c         \
+       trace_event.h   \
        truncate.c      \
        ubi.c           \
        ucopy.c         \
@@ -302,6 +327,7 @@ strace_SOURCES =    \
        xlat.h          \
        xmalloc.c       \
        xmalloc.h       \
+       xstring.h       \
        # end of strace_SOURCES
 
 if USE_LIBUNWIND
@@ -309,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@
@@ -400,6 +431,7 @@ 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           \
@@ -482,6 +514,7 @@ EXTRA_DIST =                                \
        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   \
@@ -572,7 +605,6 @@ 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         \
@@ -598,7 +630,6 @@ EXTRA_DIST =                                \
        linux/or1k/syscallent.h         \
        linux/or1k/userent.h            \
        linux/packet_diag.h             \
-       linux/personality.h             \
        linux/powerpc/arch_regs.c       \
        linux/powerpc/arch_regs.h       \
        linux/powerpc/arch_rt_sigframe.c\
@@ -637,7 +668,6 @@ EXTRA_DIST =                                \
        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  \
@@ -777,10 +807,10 @@ EXTRA_DIST =                              \
        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    \
@@ -800,6 +830,7 @@ EXTRA_DIST =                                \
        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 \
@@ -882,6 +913,7 @@ 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))
@@ -965,9 +997,12 @@ 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
        > $@
 
@@ -1038,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
 
@@ -1054,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
 
@@ -1080,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