Skip to content

Commit

Permalink
uftrace: Get rid of a copy of libtraceevent source
Browse files Browse the repository at this point in the history
It's outdated and modern distro will ship a newer version of the
library.  Let's use it instead and remove this stale copy.

Signed-off-by: Namhyung Kim <[email protected]>
  • Loading branch information
namhyung committed Oct 24, 2023
1 parent ce51c1c commit c4f30c1
Show file tree
Hide file tree
Showing 15 changed files with 2 additions and 11,396 deletions.
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ include $(srcdir)/Makefile.include
LIBMCOUNT_TARGETS := libmcount/libmcount.so libmcount/libmcount-fast.so
LIBMCOUNT_TARGETS += libmcount/libmcount-single.so libmcount/libmcount-fast-single.so

_TARGETS := uftrace libtraceevent/libtraceevent.a python/uftrace_python.so
_TARGETS := uftrace python/uftrace_python.so
_TARGETS += $(LIBMCOUNT_TARGETS) libmcount/libmcount-nop.so
_TARGETS += misc/demangler misc/symbols misc/dbginfo
TARGETS := $(patsubst %,$(objdir)/%,$(_TARGETS))
Expand Down Expand Up @@ -300,9 +300,6 @@ $(LIBMCOUNT_ARCH_OBJS): $(wildcard $(srcdir)/arch/$(ARCH)/*.[cS]) $(LIBMCOUNT_DE
$(UFTRACE_ARCH_OBJS): $(wildcard $(srcdir)/arch/$(ARCH)/*.[cS]) $(COMMON_DEPS)
@$(MAKE) -B -C $(srcdir)/arch/$(ARCH) $@

$(objdir)/libtraceevent/libtraceevent.a: $(wildcard $(srcdir)/libtraceevent/*.[ch]) $(objdir)/.config
@$(MAKE) -C $(srcdir)/libtraceevent BUILD_SRC=$(srcdir)/libtraceevent BUILD_OUTPUT=$(objdir)/libtraceevent CONFIG_FLAGS="$(TRACEEVENT_CFLAGS)"

$(objdir)/uftrace.o: $(srcdir)/uftrace.c $(objdir)/version.h $(COMMON_DEPS)
$(QUIET_CC)$(CC) $(UFTRACE_CFLAGS) -c -o $@ $<

Expand Down Expand Up @@ -331,7 +328,7 @@ $(objdir)/version.h: PHONY
$(srcdir)/utils/auto-args.h: $(srcdir)/misc/prototypes.h $(srcdir)/misc/gen-autoargs.py
$(QUIET_GEN)$(srcdir)/misc/gen-autoargs.py -i $< -o $@

$(objdir)/uftrace: $(UFTRACE_OBJS) $(UFTRACE_ARCH_OBJS) $(objdir)/libtraceevent/libtraceevent.a
$(objdir)/uftrace: $(UFTRACE_OBJS) $(UFTRACE_ARCH_OBJS)
$(QUIET_LINK)$(CC) $(UFTRACE_CFLAGS) -o $@ $(UFTRACE_OBJS) $(UFTRACE_ARCH_OBJS) $(UFTRACE_LDFLAGS)

$(objdir)/misc/demangler: $(DEMANGLER_OBJS)
Expand Down Expand Up @@ -442,7 +439,6 @@ clean:
@$(MAKE) -sC $(srcdir)/arch/$(ARCH) clean
@$(MAKE) -sC $(srcdir)/tests ARCH=$(ARCH) clean
@$(MAKE) -sC $(docdir) clean
@$(MAKE) -sC $(srcdir)/libtraceevent BUILD_SRC=$(srcdir)/libtraceevent BUILD_OUTPUT=$(objdir)/libtraceevent CONFIG_FLAGS="$(TRACEEVENT_CFLAGS)" clean

reset-coverage:
$(Q)find -name "*\.gcda" | xargs $(RM)
Expand Down
2 changes: 0 additions & 2 deletions libtraceevent/.clang-format

This file was deleted.

5 changes: 0 additions & 5 deletions libtraceevent/.gitignore

This file was deleted.

274 changes: 0 additions & 274 deletions libtraceevent/Makefile

This file was deleted.

Loading

0 comments on commit c4f30c1

Please sign in to comment.