From nobody Fri Nov 29 08:46:13 2024 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.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 469971AC452 for ; Tue, 24 Sep 2024 16:04:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727193899; cv=none; b=iCQ8KdRYGh/7u+UZnEu9zp5zOgWJ9zSK39IqACL+pqr1RS1OgPFYuhuO+mYMcwIDpBxsDdOMiB/DMMTCfUMSJha2O4dI/Dhamyjqyhh49A/AKzJR6i0J2+ZJHOzw7ZZYSeuA6ZIrdz+ya/P+W9T0JLUnUGMYtfqsjq0lLtUZNrg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727193899; c=relaxed/simple; bh=HgtplYdqCMWgkrpqDu/oJfFklGqzSqhPOh3TiNIHB5k=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=RaCDqR+wJGa25ZrToqDelDN4Ih0TrVc478yxPkMTKKsZR79lTvciDah4v+nHfhhzDbrIOuXng1PGvduHbn6NQLprS5Vbta9LkdvL4ShGHQCYBCe074Pl5f57WFDfGZFE3SQSqoX0c8EqRRy474N1lA57eNjiiXst5Nl99zoGs74= 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=SgjhGvDO; arc=none smtp.client-ip=209.85.128.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="SgjhGvDO" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6d54ab222fcso118712087b3.1 for ; Tue, 24 Sep 2024 09:04:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1727193897; x=1727798697; 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=/HA+7dw3RtBIuFOxFJuWuOogi0B/JaIuk1VQyQU3th8=; b=SgjhGvDOklX22aR2kvLbUlT+Vw7dP0F4REKHD39ROACrIor0Z408+lnGd8SDaMUTA9 jyNyRiHWY60LdMdcxpiyIRWGQjyl2TYMI8RmxkGtTkNr/dzv2pHGnr7L82EX2MNtysGn 1ZnMpS2gGc2Ibt6B53ESaJs/YU5ni5fo2KEK4HMJ0piSWH1J4nQDts81OcAk7urP5Y4r syELpHpl0F6sfWg3UsXkveLJSkVe3DI0pUD+Q0iqdgeXlEuFNNyJHJhsOJ7SNRPQhv1J VExJBLXG+uqBTV8hYZ8/TKesTOjvbqyThguSktaVhGNo/RcycHyKapk8mr2i17A1L2bz EOwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727193897; x=1727798697; 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=/HA+7dw3RtBIuFOxFJuWuOogi0B/JaIuk1VQyQU3th8=; b=RhA2HvDBpdVgkEveRuKLnKvIXUctcIiev9tNldeNabEua0rlegTRK4ixF0bQVZqxcc eB2XGkQXAb++SBtLZzCcOk9VntA+lOuHKC8jZBKuHLSpl/8pkL+/31kqqeS/xdbaadPf rTBPXjBhYNs9hAjoLyeUMT3SiC4eslwZRttWM1oaZX0wWP5oIW/6u8SojgnDPJEh3VTI adUKBep43Vmm3TJSgwwmd9RMSzuUjXlMJHOsFHdxhqa6CsErkNzYWTz45v5KdtsnaQ+s 7RUrf80dITohS2Eu1iqpdd7ttdpv96jeolhNzunTWwIW/ubwdD5FReIhJ3nr4VxX7H54 Pbdg== X-Forwarded-Encrypted: i=1; AJvYcCXsF59ql7p7js1gLfr4yyJd+AwoOduTAO/gIkM0c4tlCASFboDUkIFiZrwwAgzBdLtoSmDJxh3kTj4kIbM=@vger.kernel.org X-Gm-Message-State: AOJu0YynYxIPDkbwvgeOPQZXQY6GlHViTy6FysFIct7MKHvd7eCpSKor axtoAyzpbfiOZj8NV2J1EBGBRpvuHoZ7WPDhVi1ZBbZ14m3nhqW/yF1T7NHOYfWedSd5Sw4bJfS jaf947g== X-Google-Smtp-Source: AGHT+IHgbaLlS5UPYP2QT/IFZVE1+4hZGKpP8RHMFveYH58SJAZjQY2AHyXTkehShjGYLwStnffO/+tF37rX X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:61a6:b27c:a1cd:e6a0]) (user=irogers job=sendgmr) by 2002:a05:690c:2004:b0:6a9:3d52:79e9 with SMTP id 00721157ae682-6dfeeec1a9fmr2097177b3.4.1727193897074; Tue, 24 Sep 2024 09:04:57 -0700 (PDT) Date: Tue, 24 Sep 2024 09:04:13 -0700 In-Reply-To: <20240924160418.1391100-1-irogers@google.com> Message-Id: <20240924160418.1391100-7-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240924160418.1391100-1-irogers@google.com> X-Mailer: git-send-email 2.46.0.792.g87dc391469-goog Subject: [PATCH v1 06/11] perf build: Combine test-dwarf-getcfi into test-libdw 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 , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Guo Ren , Paul Walmsley , Palmer Dabbelt , Albert Ou , Nick Terrell , Guilherme Amadio , Changbin Du , "Steinar H. Gunderson" , "Masami Hiramatsu (Google)" , Aditya Gupta , Athira Rajeev , Masahiro Yamada , Huacai Chen , Bibo Mao , Kajol Jain , Anup Patel , Shenlin Liang , Atish Patra , Oliver Upton , Chen Pei , Dima Kogan , Alexander Lobakin , "David S. Miller" , Przemek Kitszel , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Yang Jihong Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" dwarf_getcfi support in libdw is 15 years old. Make libdw imply dwarf_getcfi support and simplify build logic. Signed-off-by: Ian Rogers --- tools/build/Makefile.feature | 1 - tools/build/feature/Makefile | 4 ---- tools/build/feature/test-dwarf_getcfi.c | 9 --------- tools/build/feature/test-libdw.c | 10 +++++++++- tools/perf/Makefile.config | 8 +------- 5 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 tools/build/feature/test-dwarf_getcfi.c diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index cf6a967575ea..ef72aae3dd49 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -31,7 +31,6 @@ endef FEATURE_TESTS_BASIC :=3D \ backtrace \ libdw \ - dwarf_getcfi \ eventfd \ fortify-source \ get_current_dir_name \ diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index 7683d171f744..f94afd522ebb 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -6,7 +6,6 @@ FILES=3D \ test-backtrace.bin \ test-bionic.bin \ test-libdw.bin \ - test-dwarf_getcfi.bin \ test-eventfd.bin \ test-fortify-source.bin \ test-get_current_dir_name.bin \ @@ -184,9 +183,6 @@ endif $(OUTPUT)test-libdw.bin: $(BUILD) $(DWLIBS) =20 -$(OUTPUT)test-dwarf_getcfi.bin: - $(BUILD) $(DWLIBS) - $(OUTPUT)test-libelf-getphdrnum.bin: $(BUILD) -lelf =20 diff --git a/tools/build/feature/test-dwarf_getcfi.c b/tools/build/feature/= test-dwarf_getcfi.c deleted file mode 100644 index 50e7d7cb7bdf..000000000000 --- a/tools/build/feature/test-dwarf_getcfi.c +++ /dev/null @@ -1,9 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include -#include - -int main(void) -{ - Dwarf *dwarf =3D NULL; - return dwarf_getcfi(dwarf) =3D=3D NULL; -} diff --git a/tools/build/feature/test-libdw.c b/tools/build/feature/test-li= bdw.c index 83ea5d5f235d..71c6f8e3b0ee 100644 --- a/tools/build/feature/test-libdw.c +++ b/tools/build/feature/test-libdw.c @@ -34,7 +34,15 @@ int test_libdw_getlocations(void) return (int)dwarf_getlocations(&attr, offset, &base, &start, &end, &op, &= nops); } =20 +int test_libdw_getcfi(void) +{ + Dwarf *dwarf =3D NULL; + + return dwarf_getcfi(dwarf) =3D=3D NULL; +} + int main(void) { - return test_libdw() + test_libdw_unwind() + test_libdw_getlocations(); + return test_libdw() + test_libdw_unwind() + test_libdw_getlocations() + + test_libdw_getcfi(); } diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 903de48c140d..9da0dc001d98 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -161,8 +161,6 @@ ifeq ($(findstring -static,${LDFLAGS}),-static) endif FEATURE_CHECK_CFLAGS-libdw :=3D $(LIBDW_CFLAGS) FEATURE_CHECK_LDFLAGS-libdw :=3D $(LIBDW_LDFLAGS) $(DWARFLIBS) -FEATURE_CHECK_CFLAGS-dwarf_getcfi :=3D $(LIBDW_CFLAGS) -FEATURE_CHECK_LDFLAGS-dwarf_getcfi :=3D $(LIBDW_LDFLAGS) $(DWARFLIBS) =20 # for linking with debug library, run like: # make DEBUG=3D1 LIBBABELTRACE_DIR=3D/opt/libbabeltrace/ @@ -467,11 +465,7 @@ else endif else CFLAGS +=3D -DHAVE_DWARF_GETLOCATIONS_SUPPORT - ifneq ($(feature-dwarf_getcfi), 1) - $(warning Old libdw.h, finding variables at given 'perf probe' poi= nt will not work, install elfutils-devel/libdw-dev >=3D 0.142) - else - CFLAGS +=3D -DHAVE_DWARF_CFI_SUPPORT - endif # dwarf_getcfi + CFLAGS +=3D -DHAVE_DWARF_CFI_SUPPORT endif # Dwarf support endif # libelf support endif # NO_LIBELF --=20 2.46.0.792.g87dc391469-goog