From: Jinshan Xiong <jinshan.xiong@gmail.com>
To: jolsa@redhat.com, arnaldo.melo@gmail.com
Cc: Jinshan Xiong <jinshan.xiong@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Namhyung Kim <namhyung@kernel.org>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] tools/lib/perf: make the static libperf complete
Date: Mon, 27 Sep 2021 15:30:26 -0700 [thread overview]
Message-ID: <20210927223101.3155964-1-jinshan.xiong@gmail.com> (raw)
In-Reply-To: <CABoqRjsUPhJk6A7QOh_9z6zHLyqX=ZZG7gkcEZeui1uO4m7Bbg@mail.gmail.com>
This patch makes libperf.a complete. Initially it misses the symbols
fdarray_* that makes it unusable after being installed by:
$ make install DESTDIR=<install_dir>
Check missing symbols:
$ nm tools/lib/perf/libperf.a | grep fdarray_
U fdarray__add
0000000000002b3e t fdarray__available_entries
U fdarray__exit
U fdarray__filter
U fdarray__grow
U fdarray__init
U fdarray__poll
After this patch is applied:
$ nm tools/lib/perf/libperf-ext.a | grep fdarray_
00000000000063f7 T fdarray__add
......
00000000000065d4 T fdarray__poll
Signed-off-by: "Jinshan Xiong" <jinshan.xiong@gmail.com>
---
tools/lib/perf/Makefile | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/lib/perf/Makefile b/tools/lib/perf/Makefile
index 08fe6e3c4089..b2f7f4fd7065 100644
--- a/tools/lib/perf/Makefile
+++ b/tools/lib/perf/Makefile
@@ -94,7 +94,8 @@ LIBPERF_A := $(OUTPUT)libperf.a
LIBPERF_IN := $(OUTPUT)libperf-in.o
LIBPERF_PC := $(OUTPUT)libperf.pc
-LIBPERF_ALL := $(LIBPERF_A) $(OUTPUT)libperf.so*
+LIBPERF_A_EXT := $(OUTPUT)libperf-ext.a
+LIBPERF_LIBS_INSTALL := $(LIBPERF_A_EXT) $(OUTPUT)libperf.so*
LIB_DIR := $(srctree)/tools/lib/api/
@@ -124,6 +125,9 @@ $(LIBPERF_IN): FORCE
$(LIBPERF_A): $(LIBPERF_IN)
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIBPERF_IN)
+$(LIBPERF_A_EXT): $(LIBPERF_IN) $(LIBAPI)
+ $(QUIET_AR)$(RM) $@ && $(LD) -r -o libperf-ext.o $^ && $(AR) rcs $@ libperf-ext.o
+
$(LIBPERF_SO): $(LIBPERF_IN) $(LIBAPI)
$(QUIET_LINK)$(CC) --shared -Wl,-soname,libperf.so \
-Wl,--version-script=$(VERSION_SCRIPT) $^ -o $@
@@ -131,7 +135,7 @@ $(LIBPERF_SO): $(LIBPERF_IN) $(LIBAPI)
@ln -sf $(@F) $(OUTPUT)libperf.so.$(LIBPERF_VERSION)
-libs: $(LIBPERF_A) $(LIBPERF_SO) $(LIBPERF_PC)
+libs: $(LIBPERF_A) $(LIBPERF_A_EXT) $(LIBPERF_SO) $(LIBPERF_PC)
all: fixdep
$(Q)$(MAKE) libs
@@ -183,9 +187,9 @@ define do_install
endef
install_lib: libs
- $(call QUIET_INSTALL, $(LIBPERF_ALL)) \
+ $(call QUIET_INSTALL, $(LIBPERF_LIBS_INSTALL)) \
$(call do_install_mkdir,$(libdir_SQ)); \
- cp -fpR $(LIBPERF_ALL) $(DESTDIR)$(libdir_SQ)
+ cp -fpR $(LIBPERF_LIBS_INSTALL) $(DESTDIR)$(libdir_SQ)
install_headers:
$(call QUIET_INSTALL, headers) \
--
2.30.2
next prev parent reply other threads:[~2021-09-27 22:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-26 2:30 [PATCH] " Jinshan Xiong
2021-09-26 12:14 ` Arnaldo Carvalho de Melo
2021-09-27 22:12 ` Jinshan Xiong
2021-09-27 22:30 ` Jinshan Xiong [this message]
2021-09-28 21:43 ` [PATCH v2] " Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210927223101.3155964-1-jinshan.xiong@gmail.com \
--to=jinshan.xiong@gmail.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=arnaldo.melo@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®