Skip to contentSkip to conversation

perf jvmti: Link against tools/lib/string.h to have weak strlcpy()

PATCH New Thomas Richter 1 participant 1 message Sep 4, 2019 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf jvmti: Link against tools/lib/string.h to have weak strlcpy()

That is needed in systems such some S/390 distros.

[root@m35lp76 perf]# readelf -s jvmti/jvmti-in.o | fgrep strlcpy
408: 0000000000002bc8 216 FUNC WEAK DEFAULT 116 strlcpy
[root@m35lp76 perf]#

---
 tools/perf/jvmti/Build | 13 +++++++++++++
 1 file changed, 13 insertions(+)
tools/perf/jvmti/Build +13 -0
index eaeb8cb5379b..202cadaaf097 100644
@@ -1,8 +1,21 @@
 jvmti-y += libjvmti.o
 jvmti-y += jvmti_agent.o
 
+# For strlcpy
+jvmti-y += libstring.o libctype.o
+
 CFLAGS_jvmti         = -fPIC -DPIC -I$(JDIR)/include -I$(JDIR)/include/linux
 CFLAGS_REMOVE_jvmti  = -Wmissing-declarations
 CFLAGS_REMOVE_jvmti += -Wstrict-prototypes
 CFLAGS_REMOVE_jvmti += -Wextra
 CFLAGS_REMOVE_jvmti += -Wwrite-strings
+
+CFLAGS_libstring.o += -Wno-unused-parameter -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
+
+$(OUTPUT)jvmti/libstring.o: ../lib/string.c FORCE
+	$(call rule_mkdir)
+	$(call if_changed_dep,cc_o_c)
+
+$(OUTPUT)jvmti/libctype.o: ../lib/ctype.c FORCE
+	$(call rule_mkdir)
+	$(call if_changed_dep,cc_o_c)
Signature · 1 line
2.21.0