From patchwork Wed Jan 22 17:43:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13947606 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBFD921ADAE for ; Wed, 22 Jan 2025 17:43:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737567827; cv=none; b=JEIG9d7wdfyVp/aEjng1TGzKKvTokXP0UQKMSnmdtluYvNJ02rpqejWzYVRM0gcxLuw2lEJdL0IatNUBaSs5hBK33ZXJR7MnmrvgqNBL7UcwISNQDuu6lXmlf019Fcf9hwlqgNP2oVxW+Br+L8+9vZzG1ebeCnfsZpg31/OfbfI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737567827; c=relaxed/simple; bh=mdaHPKAoKWAvFgch/t6QjrxjLj68hIBhC6OxXPIMVSw=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=coVhTvwP7zl6mSTl80RJ6DBk30wofdGdxOFDzXnjhyRr9l1PsnGxuj6CPseUjyNMFCQ+W+LVkWh9KiUgsDdUTqU0leTKBVb19HOMnHYbU/IpcYqgN/G7xwR0CtDrehI2WhKkeQOTui+9mErveQQYGHs+lJjmQFRDQ+FD1KWze3U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HYf/aiWb; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HYf/aiWb" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e549b6c54a0so19307010276.3 for ; Wed, 22 Jan 2025 09:43:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1737567824; x=1738172624; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=z8GrJZ0fsWrHpsTUZU18QyLM9IZZokR195LxXJCULNw=; b=HYf/aiWblW6bldxy5xW560xZrPhlAot8WFMdXBXvphJ8DmadazXvcusZ4zEqNfPqPj W4ZEMnqULc+gjfpRc5+KbMnxqknOLd4K6fJ1nJAGkuV01MgTh6cAUFvcuAPmWfK+i/iM WvapL5HWHf7zJqSjml/NyLXyFMnojDDEEp0VOs4lM40dysggEpkWNqeADkY15UideYaX IEVpMoGzs1kLVELZ5MlLgkGzBMuqaXLRAECN5OdmsDDtfGkLAXP1IezA/E92csUBVNVA 5STH9S7b7X/b0ywEar45mXcm42vioDIoZx5aGKdca/M2qZ1pYD8xftWfsenxskn7yzim QzNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737567824; x=1738172624; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=z8GrJZ0fsWrHpsTUZU18QyLM9IZZokR195LxXJCULNw=; b=FceTVQqt9gjH04Jwh8k1CL3c5iAOtiaI2I3WHLObCkhFlPAANWxIRQVamIIXXZmWHB LHpWfgWIaS5+CJVCiv9pgueU3zPqZIhyLcrVGsnQ4wG18IDS2GqRK31OnEqeQ/4M2OGR qCRPYI3z6lGSNcJbzWkVsVu+Jh/q0sv65KMwO7ld+aCpAm1skbisxbKPLsVMvBSUPcLm uFEgPy/O9SjOnuQCDQtDcSDAZ5+3DWhYoKPGdkZvt2cGlv/9XLJvlcbhGQ2XVGBYulzR VKpQ8X39LMyedA2/SW3AUlDk3Gftv8Ayrh473PaKZsb5op1zyOCGi2DqJYFyip0svdic nGsw== X-Forwarded-Encrypted: i=1; AJvYcCU7a4JcY3xUSGVVuvOF2fXoP++WAheOJ3Rm7zrqi0ZV0AgtLfJzTAYyH0V6rB+a9Jze/Wg=@vger.kernel.org X-Gm-Message-State: AOJu0YwSHL4fGuDAV/K9lPXluuBhAoiMMaqsHSNKTDBwdHA4LsAVb1Ge OmiIyjP7MVmYH62atr+92bc9VPkKZxZjzw3YIhAmCghFv3Y/0MjHTWfJCcrXYJNQogL4tDzDDfT lF9BWNw== X-Google-Smtp-Source: AGHT+IEYTvIMCq+d8mMxsLaBCnWLHLN3S0/RB1ZC439k7yTn7O1snOVUkYPg4+trYjQ3ownolXyolli2Ngj9 X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:807b:be79:d5c3:ee5c]) (user=irogers job=sendgmr) by 2002:a05:690c:84e:b0:6ef:7d06:1eb7 with SMTP id 00721157ae682-6f6eb649981mr495107b3.2.1737567823833; Wed, 22 Jan 2025 09:43:43 -0800 (PST) Date: Wed, 22 Jan 2025 09:43:04 -0800 In-Reply-To: <20250122174308.350350-1-irogers@google.com> Message-Id: <20250122174308.350350-15-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250122174308.350350-1-irogers@google.com> X-Mailer: git-send-email 2.48.1.262.g85cc9f2d1e-goog Subject: [PATCH v3 14/18] perf build: Remove libiberty support From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Aditya Gupta , "Steinar H. Gunderson" , Charlie Jenkins , Changbin Du , "Masami Hiramatsu (Google)" , James Clark , Kajol Jain , Athira Rajeev , Li Huafei , Dmitry Vyukov , Andi Kleen , Chaitanya S Prakash , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, llvm@lists.linux.dev, Song Liu , bpf@vger.kernel.org libiberty is license incompatible with perf and building requires the BUILD_NONDISTRO=1 build flag. libiberty is used for HAVE_CPLUS_DEMANGLE_SUPPORT. Remove the code to simplify the code base as it can't be distributed. Remove the BUILD_NONDISTRO build flag and test as they no longer enable/disable support. Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 12 ------------ tools/perf/Makefile.perf | 11 ++++------- tools/perf/tests/make | 2 -- tools/perf/util/demangle-cxx.cpp | 13 +------------ tools/perf/util/symbol-elf.c | 13 ------------- 5 files changed, 5 insertions(+), 46 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 900be0349de9..513dd5cab605 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -949,18 +949,6 @@ ifndef NO_DEMANGLE CXXFLAGS += -DHAVE_CXA_DEMANGLE_SUPPORT $(call detected,CONFIG_CXX_DEMANGLE) endif - ifdef BUILD_NONDISTRO - ifeq ($(filter -liberty,$(EXTLIBS)),) - $(call feature_check,cplus-demangle) - ifeq ($(feature-cplus-demangle), 1) - EXTLIBS += -liberty - endif - endif - ifneq ($(filter -liberty,$(EXTLIBS)),) - CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT - CXXFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT - endif - endif endif ifndef NO_LZMA diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index a2886abd4f02..398c30b6bdce 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -123,9 +123,6 @@ include ../scripts/utilities.mak # # Set BUILD_BPF_SKEL to 0 to override BUILD_BPF_SKEL and not build BPF skeletons # -# Define BUILD_NONDISTRO to enable building an linking against libbfd and -# libiberty distribution license incompatible libraries. -# # Define EXTRA_TESTS to enable building extra tests useful mainly to perf # developers, such as: # x86 instruction decoder - new instructions test @@ -329,10 +326,10 @@ LIBSYMBOL_DIR = $(srctree)/tools/lib/symbol/ LIBPERF_DIR = $(srctree)/tools/lib/perf/ DOC_DIR = $(srctree)/tools/perf/Documentation/ -# Set FEATURE_TESTS to 'all' so all possible feature checkers are executed. -# Without this setting the output feature dump file misses some features, for -# example, liberty. Select all checkers so we won't get an incomplete feature -# dump file. +# Set FEATURE_TESTS to 'all' so all possible feature checkers are +# executed. Without this setting the output feature dump file misses +# some features. Select all checkers so we won't get an incomplete +# feature dump file. ifeq ($(config),1) ifdef MAKECMDGOALS ifeq ($(filter feature-dump,$(MAKECMDGOALS)),feature-dump) diff --git a/tools/perf/tests/make b/tools/perf/tests/make index 44d76eacce49..4a1ed20bff7e 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -68,7 +68,6 @@ python_perf_so := $(shell $(MAKE) python_perf_target|grep "Target is:"|awk '{pri make_clean_all := clean all make_python_perf_so := $(python_perf_so) make_debug := DEBUG=1 -make_nondistro := BUILD_NONDISTRO=1 make_extra_tests := EXTRA_TESTS=1 make_jevents_all := JEVENTS_ARCH=all make_no_bpf_skel := BUILD_BPF_SKEL=0 @@ -139,7 +138,6 @@ MAKE_F := $(MAKE) -f $(MK) endif run += make_python_perf_so run += make_debug -run += make_nondistro run += make_extra_tests run += make_jevents_all run += make_no_bpf_skel diff --git a/tools/perf/util/demangle-cxx.cpp b/tools/perf/util/demangle-cxx.cpp index bd657eb37efc..36801ea327a6 100644 --- a/tools/perf/util/demangle-cxx.cpp +++ b/tools/perf/util/demangle-cxx.cpp @@ -8,13 +8,6 @@ #include #endif -#if defined(HAVE_CPLUS_DEMANGLE_SUPPORT) -#ifndef DMGL_PARAMS -#define DMGL_PARAMS (1 << 0) /* Include function args */ -#define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */ -#endif -#endif - /* * Demangle C++ function signature * @@ -24,11 +17,7 @@ extern "C" char *cxx_demangle_sym(const char *str, bool params __maybe_unused, bool modifiers __maybe_unused) { -#if defined(HAVE_CPLUS_DEMANGLE_SUPPORT) - int flags = (params ? DMGL_PARAMS : 0) | (modifiers ? DMGL_ANSI : 0); - - return cplus_demangle(str, flags); -#elif defined(HAVE_CXA_DEMANGLE_SUPPORT) +#if defined(HAVE_CXA_DEMANGLE_SUPPORT) char *output; int status; diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 8140f60af1e5..121db55b9709 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -27,13 +27,6 @@ #include #include -#if defined(HAVE_CPLUS_DEMANGLE_SUPPORT) -#ifndef DMGL_PARAMS -#define DMGL_PARAMS (1 << 0) /* Include function args */ -#define DMGL_ANSI (1 << 1) /* Include const, volatile, etc */ -#endif -#endif - #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM 64 bit */ #endif @@ -286,13 +279,7 @@ static bool want_demangle(bool is_kernel_sym) char *cxx_demangle_sym(const char *str __maybe_unused, bool params __maybe_unused, bool modifiers __maybe_unused) { -#if defined(HAVE_CPLUS_DEMANGLE_SUPPORT) - int flags = (params ? DMGL_PARAMS : 0) | (modifiers ? DMGL_ANSI : 0); - - return cplus_demangle(str, flags); -#else return NULL; -#endif } #endif /* !HAVE_CXA_DEMANGLE_SUPPORT */