From nobody Thu Apr 9 21:51:19 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (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 75EF1364044 for ; Thu, 5 Mar 2026 22:19:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772749190; cv=none; b=a/ctCRPYlS2vSpF5Ml+X5A3RDSAfn5fRtWJz5Nw5J+Pw8Jped28TXB6swq9t/yrdESEPwkwV7S01Aqm0/Yi/b5IYyrMYPeC927oL5ZAk1ACVxV09ZGQqCOq+hpOWztNHQ/htNF0vTjXjMlA9W/e5T48stmjaRgluXG3pPe27HBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772749190; c=relaxed/simple; bh=aByzoR2ts9ih+0N9j5NApfRYrIS0PYqQcc/wzIPCpCk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Wh3/mNWqWWfYuB6y9SMg92+peKyD5eYNkQbc1siqegOQN/ub/s9dlf9fQUaFX337lG+l1h/zgRuNa+3aHfUbvIXAMShygBRWApLe1aXot7jApmNbvfNBJQ1HEEIlMssJMHA5NW/X2Z9J8eQVCGuBms/qGW4h7j0hiFkah4tTJIE= 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=T9sWieM3; arc=none smtp.client-ip=74.125.82.74 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="T9sWieM3" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-12711ec96fbso5201742c88.0 for ; Thu, 05 Mar 2026 14:19:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1772749188; x=1773353988; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=enTjN37d4hARcTHIjUjR8jWWNgPDrM7ZrLy1xVh8f7c=; b=T9sWieM3Gso9RZYXUa6epDafQyBwPFLCY/uc3k4t5mExYCkI8fRy33HvebLs0+1m1S R4ebxtUKrP0Xf0Lj5inOfX3n1Zmc0q325ftjI4kupGhbKTEksj653KPCVWzoYMwOgoY9 dWEEPtYabfsmXnS7zhuepx3A+/gsUuQ0c4WVVAB9ua/482FG90PC/9jmj5yDDUi+/EL3 24TS3T93MLmhcuil5fqVauM6zDbOITBvSVNDDkVUPpV80ywPDNar9/Nyp4qGW1KnWbPr dFkgyExaYgMsaBoN298R6ydSnVYSWzL6UwlK/ReZFaS7sW1QFrOG/sgh54u//AaXBzML cHOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772749188; x=1773353988; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=enTjN37d4hARcTHIjUjR8jWWNgPDrM7ZrLy1xVh8f7c=; b=YtBte0H/wmCjSA7FnLM0PEcQFmSyrFniTyfKAVFfXOa93y+/brM33p6jISbBCfhkKY 7/dudYHH9URnNuwjUwl1QBYkNTr0qc62/u1c1UZA+KOfjl8aewy/BaQn6Ww/Z4uRJfjl ymstuERbS2o3i5Y/4Mtt4VzO1SG8p4atNW053GxICa2CLwmaZlfkur/LoYcIAhBHKKhg GK6bao8zBltdHJwhXDTh1R21Cl9OTnM/p+UluaD5zZm9FyIC8pCcaVI35KalIbpuVKBF 9gk3/XDiKuDYZMnEmGvx+1Ft7NxHNbJlhS5UOA9N3e7Khc9Hpib45DVeP7Xh9OT9ywXF J32g== X-Forwarded-Encrypted: i=1; AJvYcCX0bJHl7f82HLHvluMaLBjX2fDUP/DU6JHSPF+DX6PcK7gQf33e+tB/G6h2Chn7jpSerPG+rKTRL9HY9HA=@vger.kernel.org X-Gm-Message-State: AOJu0YyPQKOWfeJFSW7cm+HHPdpEEthxHRGqrkFU5DpNAsfDCKvn+7Gt rC6wmghwqJDOSt+GK/ouf1gNkJoTuMcj1pEC7EOhHXcyGDbgEwn6zBksvnf+TMyPBjFAgeC2o0e PBG5XzlWk6Q== X-Received: from dyx5.prod.google.com ([2002:a05:693c:8205:b0:2bd:f73f:2b3]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:427:b0:124:9ae7:b2df with SMTP id a92af1059eb24-128c2ecce39mr3060c88.44.1772749187504; Thu, 05 Mar 2026 14:19:47 -0800 (PST) Date: Thu, 5 Mar 2026 14:19:23 -0800 In-Reply-To: <20260305221927.3237145-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260305221927.3237145-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog Message-ID: <20260305221927.3237145-5-irogers@google.com> Subject: [PATCH v2 4/8] perf build: Be more programmatic when setting up libunwind variables From: Ian Rogers To: irogers@google.com Cc: 9erthalion6@gmail.com, acme@kernel.org, adrian.hunter@intel.com, alex@ghiti.fr, alexander.shishkin@linux.intel.com, andrew.jones@oss.qualcomm.com, aou@eecs.berkeley.edu, atrajeev@linux.ibm.com, blakejones@google.com, ctshao@google.com, dapeng1.mi@linux.intel.com, howardchu95@gmail.com, james.clark@linaro.org, john.g.garry@oracle.com, jolsa@kernel.org, leo.yan@linux.dev, libunwind-devel@nongnu.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-riscv@lists.infradead.org, mingo@redhat.com, namhyung@kernel.org, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, shimin.guo@skydio.com, tglozar@redhat.com, tmricht@linux.ibm.com, will@kernel.org, yuzhuo@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Iterate LIBUNWIND_ARCHS when setting up CONFIG_ and HAVE_ definitions rather than treating each architecture individually. This sets up the libunwind build variables and C definitions beyond x86 and arm/aarch64. The existing naming convention is followed for compatibility. Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 215 +++++++++++++++---------------------- 1 file changed, 89 insertions(+), 126 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index a8dc72cfe48e..f38213ecce08 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -65,95 +65,83 @@ $(call detected_var,SRCARCH) =20 CFLAGS +=3D -I$(OUTPUT)arch/$(SRCARCH)/include/generated =20 -# Additional ARCH settings for ppc -ifeq ($(SRCARCH),powerpc) - ifndef NO_LIBUNWIND - LIBUNWIND_LIBS :=3D -lunwind -lunwind-ppc64 - endif -endif - # Additional ARCH settings for x86 ifeq ($(SRCARCH),x86) $(call detected,CONFIG_X86) ifeq (${IS_64_BIT}, 1) CFLAGS +=3D -DHAVE_ARCH_X86_64_SUPPORT ARCH_INCLUDE =3D ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/mem= set_64.S - ifndef NO_LIBUNWIND - LIBUNWIND_LIBS =3D -lunwind-x86_64 -lunwind -llzma - endif $(call detected,CONFIG_X86_64) - else - ifndef NO_LIBUNWIND - LIBUNWIND_LIBS =3D -lunwind-x86 -llzma -lunwind - endif endif endif =20 -ifeq ($(SRCARCH),arm) - ifndef NO_LIBUNWIND - LIBUNWIND_LIBS =3D -lunwind -lunwind-arm - endif +ifeq ($(ARCH),s390) + CFLAGS +=3D -fPIC endif =20 -ifeq ($(SRCARCH),arm64) - ifndef NO_LIBUNWIND - LIBUNWIND_LIBS =3D -lunwind -lunwind-aarch64 - endif +ifneq ($(LIBUNWIND),1) + NO_LIBUNWIND :=3D 1 endif =20 -ifeq ($(SRCARCH),loongarch) - ifndef NO_LIBUNWIND +ifndef NO_LIBUNWIND + ifeq ($(SRCARCH),arm) + LIBUNWIND_LIBS =3D -lunwind -lunwind-arm + endif + ifeq ($(SRCARCH),arm64) + LIBUNWIND_LIBS =3D -lunwind -lunwind-aarch64 + endif + ifeq ($(SRCARCH),loongarch) LIBUNWIND_LIBS =3D -lunwind -lunwind-loongarch64 endif -endif - -ifeq ($(ARCH),s390) - CFLAGS +=3D -fPIC -endif - -ifeq ($(ARCH),mips) - ifndef NO_LIBUNWIND + ifeq ($(ARCH),mips) LIBUNWIND_LIBS =3D -lunwind -lunwind-mips endif + ifeq ($(SRCARCH),powerpc) + LIBUNWIND_LIBS :=3D -lunwind -lunwind-ppc64 + endif + ifeq ($(SRCARCH),riscv) + LIBUNWIND_LIBS :=3D -lunwind -lunwind-riscv + endif + ifeq ($(SRCARCH),s390) + LIBUNWIND_LIBS :=3D -lunwind -lunwind-s390x + endif + ifeq ($(SRCARCH),x86) + ifeq (${IS_64_BIT}, 1) + LIBUNWIND_LIBS =3D -lunwind-x86_64 -lunwind -llzma + else + LIBUNWIND_LIBS =3D -lunwind-x86 -lunwind -llzma + endif + endif + ifeq ($(LIBUNWIND_LIBS),) + NO_LIBUNWIND :=3D 1 + endif endif =20 -ifneq ($(LIBUNWIND),1) - NO_LIBUNWIND :=3D 1 -endif - -ifeq ($(LIBUNWIND_LIBS),) - NO_LIBUNWIND :=3D 1 -endif # # For linking with debug library, run like: # # make DEBUG=3D1 LIBUNWIND_DIR=3D/opt/libunwind/ # - -libunwind_arch_set_flags =3D $(eval $(libunwind_arch_set_flags_code)) -define libunwind_arch_set_flags_code - FEATURE_CHECK_CFLAGS-libunwind-$(1) =3D -I$(LIBUNWIND_DIR)/include - FEATURE_CHECK_LDFLAGS-libunwind-$(1) =3D -L$(LIBUNWIND_DIR)/lib -endef - -ifdef LIBUNWIND_DIR - LIBUNWIND_CFLAGS =3D -I$(LIBUNWIND_DIR)/include - LIBUNWIND_LDFLAGS =3D -L$(LIBUNWIND_DIR)/lib - LIBUNWIND_ARCHS =3D x86 x86_64 arm aarch64 debug-frame-arm debug-frame-a= arch64 loongarch - $(foreach libunwind_arch,$(LIBUNWIND_ARCHS),$(call libunwind_arch_set_fl= ags,$(libunwind_arch))) -endif +LIBUNWIND_ARCHS:=3Daarch64 arm loongarch64 mips ppc32 ppc64 riscv s390x x8= 6 x86_64 =20 ifndef NO_LIBUNWIND - # Set per-feature check compilation flags FEATURE_CHECK_CFLAGS-libunwind =3D $(LIBUNWIND_CFLAGS) FEATURE_CHECK_LDFLAGS-libunwind =3D $(LIBUNWIND_LDFLAGS) $(LIBUNWIND_LIB= S) FEATURE_CHECK_CFLAGS-libunwind-debug-frame =3D $(LIBUNWIND_CFLAGS) FEATURE_CHECK_LDFLAGS-libunwind-debug-frame =3D $(LIBUNWIND_LDFLAGS) $(L= IBUNWIND_LIBS) - =20 - FEATURE_CHECK_LDFLAGS-libunwind-arm +=3D -lunwind -lunwind-arm - FEATURE_CHECK_LDFLAGS-libunwind-aarch64 +=3D -lunwind -lunwind-aarch64 - FEATURE_CHECK_LDFLAGS-libunwind-x86 +=3D -lunwind -llzma -lunwind-x86 - FEATURE_CHECK_LDFLAGS-libunwind-x86_64 +=3D -lunwind -llzma -lunwind-x86= _64 + + ifdef LIBUNWIND_DIR + LIBUNWIND_CFLAGS =3D -I$(LIBUNWIND_DIR)/include + LIBUNWIND_LDFLAGS =3D -L$(LIBUNWIND_DIR)/lib + + define libunwind_arch_set_flags + FEATURE_CHECK_CFLAGS-libunwind-$(1) =3D -I$(LIBUNWIND_DIR)/include + FEATURE_CHECK_LDFLAGS-libunwind-$(1) =3D -L$(LIBUNWIND_DIR)/lib + endef + $(foreach arch,$(LIBUNWIND_ARCHS), \ + $(eval $(call libunwind_arch_set_flags,$(arch))) \ + ) + endif endif =20 ifdef CSINCLUDES @@ -637,49 +625,6 @@ ifeq ($(SRCARCH),powerpc) endif endif =20 -ifndef NO_LIBUNWIND - have_libunwind :=3D - - $(call feature_check,libunwind) - - $(call feature_check,libunwind-x86) - ifeq ($(feature-libunwind-x86), 1) - $(call detected,CONFIG_LIBUNWIND_X86) - CFLAGS +=3D -DHAVE_LIBUNWIND_X86_SUPPORT - LDFLAGS +=3D -lunwind-x86 - EXTLIBS_LIBUNWIND +=3D -lunwind-x86 - have_libunwind =3D 1 - endif - - $(call feature_check,libunwind-aarch64) - ifeq ($(feature-libunwind-aarch64), 1) - $(call detected,CONFIG_LIBUNWIND_AARCH64) - CFLAGS +=3D -DHAVE_LIBUNWIND_AARCH64_SUPPORT - LDFLAGS +=3D -lunwind-aarch64 - EXTLIBS_LIBUNWIND +=3D -lunwind-aarch64 - have_libunwind =3D 1 - $(call feature_check,libunwind-debug-frame-aarch64) - ifneq ($(feature-libunwind-debug-frame-aarch64), 1) - $(warning No debug_frame support found in libunwind-aarch64) - CFLAGS +=3D -DNO_LIBUNWIND_DEBUG_FRAME_AARCH64 - endif - endif - - ifneq ($(feature-libunwind), 1) - $(warning No libunwind found. Please install libunwind-dev[el] >=3D 1.= 1 and/or set LIBUNWIND_DIR and set LIBUNWIND=3D1 in the make command line a= s it is opt-in now) - NO_LOCAL_LIBUNWIND :=3D 1 - else - have_libunwind :=3D 1 - $(call detected,CONFIG_LOCAL_LIBUNWIND) - endif - - ifneq ($(have_libunwind), 1) - NO_LIBUNWIND :=3D 1 - endif -else - NO_LOCAL_LIBUNWIND :=3D 1 -endif - ifndef NO_LIBBPF ifneq ($(feature-bpf), 1) $(warning BPF API too old. Please install recent kernel headers. BPF s= upport in 'perf record' is disabled.) @@ -738,6 +683,49 @@ ifndef GEN_VMLINUX_H VMLINUX_H=3D$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h endif =20 +ifndef NO_LIBUNWIND + have_libunwind :=3D + + $(call feature_check,libunwind) + ifneq ($(feature-libunwind), 1) + $(warning No libunwind found. Please install libunwind-dev[el] >=3D 1.= 1 and/or set LIBUNWIND_DIR and set LIBUNWIND=3D1 in the make command line a= s it is opt-in now) + NO_LOCAL_LIBUNWIND :=3D 1 + else + have_libunwind :=3D 1 + $(call detected,CONFIG_LOCAL_LIBUNWIND) + CFLAGS +=3D -DHAVE_LIBUNWIND_SUPPORT + CFLAGS +=3D $(LIBUNWIND_CFLAGS) + LDFLAGS +=3D $(LIBUNWIND_LDFLAGS) + EXTLIBS +=3D $(EXTLIBS_LIBUNWIND) + $(call feature_check,libunwind-debug-frame) + ifneq ($(feature-libunwind-debug-frame), 1) + CFLAGS +=3D -DNO_LIBUNWIND_DEBUG_FRAME + endif + endif + + define PROCESS_REMOTE_LIBUNWIND_ARCH + $(call feature_check,libunwind-$(1)) + + ifeq ($$(feature-libunwind-$(1)), 1) + upper_arch :=3D $$(shell echo $(1) | tr '[:lower:]' '[:upper:]') + $$(call detected,CONFIG_LIBUNWIND_$$(upper_arch)) + + CFLAGS +=3D -DHAVE_LIBUNWIND_$$(upper_arch)_SUPPORT + LDFLAGS +=3D -lunwind-$(1) + EXTLIBS_LIBUNWIND +=3D -lunwind-$(1) + have_libunwind :=3D 1 + + $$(call feature_check,libunwind-debug-frame-$(1)) + ifneq ($$(feature-libunwind-debug-frame-$(1)), 1) + CFLAGS +=3D -DNO_LIBUNWIND_DEBUG_FRAME_$$(upper_arch) + endif + endif + endef + $(foreach arch,$(LIBUNWIND_ARCHS), \ + $(eval $(call PROCESS_REMOTE_LIBUNWIND_ARCH,$(arch))) \ + ) +endif + dwarf-post-unwind :=3D 1 dwarf-post-unwind-text :=3D BUG =20 @@ -760,31 +748,6 @@ ifeq ($(dwarf-post-unwind),1) $(call detected,CONFIG_DWARF_UNWIND) endif =20 -ifndef NO_LIBUNWIND - ifndef NO_LOCAL_LIBUNWIND - ifeq ($(SRCARCH),$(filter $(SRCARCH),arm arm64)) - $(call feature_check,libunwind-debug-frame) - ifneq ($(feature-libunwind-debug-frame), 1) - $(warning No debug_frame support found in libunwind) - CFLAGS +=3D -DNO_LIBUNWIND_DEBUG_FRAME - endif - else - # non-ARM has no dwarf_find_debug_frame() function: - CFLAGS +=3D -DNO_LIBUNWIND_DEBUG_FRAME - endif - EXTLIBS +=3D $(LIBUNWIND_LIBS) - LDFLAGS +=3D $(LIBUNWIND_LIBS) - endif - ifeq ($(findstring -static,${LDFLAGS}),-static) - # gcc -static links libgcc_eh which contans piece of libunwind - LIBUNWIND_LDFLAGS +=3D -Wl,--allow-multiple-definition - endif - CFLAGS +=3D -DHAVE_LIBUNWIND_SUPPORT - CFLAGS +=3D $(LIBUNWIND_CFLAGS) - LDFLAGS +=3D $(LIBUNWIND_LDFLAGS) - EXTLIBS +=3D $(EXTLIBS_LIBUNWIND) -endif - ifneq ($(NO_LIBTRACEEVENT),1) $(call detected,CONFIG_TRACE) endif --=20 2.53.0.473.g4a7958ca14-goog