From 1ddcee0bd115d2f843f82061cb0d1741bf90151d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 5 Jan 2024 08:03:20 +0000
Subject: gentoo auto-resync : 05:01:2024 - 08:03:20

---
 dev-util/perf/Manifest        |  2 +-
 dev-util/perf/perf-6.6.ebuild | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'dev-util/perf')

diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 043ed56a7565..296d004eef27 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -6,5 +6,5 @@ DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a3743
 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 EBUILD perf-6.3.ebuild 7844 BLAKE2B 30bc7a2ee9db31f89553228baf7330780ec6e03a8dc9b4bfc5b8306e5a40ffb10d6e49a425b7580bb1d0df32d6016dd041b0d998543216771a4ec19525210b57 SHA512 ac316d6316f5f8b21ccb0fcd8d7f104b3b8d254d20dfd869980f4262fa9e1c22a4bf8c890bb7f5174a3cd5bf172fd89f6e9ff1d6544ceee5fd87fb8116eb448b
 EBUILD perf-6.5.ebuild 8574 BLAKE2B 05dd5c04b78c41982410cd39e1fe6ce9deb0c80086b95cdfb34b969e84b371e90f66fb4ad03520aea708fe7c5caddef5d090a43464967ba3079e410ab8422960 SHA512 f4e2a3743ce488e81cfba612c8d81acbbba119fa3b9ec275f756d2e6e41c2d62fed6ac5dcfdd22ec8b1f0981f077a0c306d569565efc102d49eeacaf24946725
-EBUILD perf-6.6.ebuild 8290 BLAKE2B bcb711e8a3e6d3cb6e40fd6691d49f873c48b1ddd06a3239178f088d2f41eb6ffa68438d9821bc076a108e001bf6ef48f760b9e18c8080f6e843cc2adf84cbb6 SHA512 82e67d5409a086911d1275cd6c9cd24f20b6cbdee180e063d9c411908f5e2d0cabc8792c3e376f340c3dbe16ad3bfb0834d2d2cf5b634347c394162ca85dc3e1
+EBUILD perf-6.6.ebuild 8983 BLAKE2B 9059ffe059fd345ff04f5b618ea114ae23f594be938f83b3a52c6af80dad5fd56fb74573304c79aad655051eea4788eb5bd81d6e1c869c0f406ffc99df918b5b SHA512 4d08c2203943f445d24f2a813e8db2b4d5137872238050b127cb622724836580fd304b46d8db2a2ff410ab8ba996ba55a989ccbf4865068b8dac5e16e585d27e
 MISC metadata.xml 1642 BLAKE2B 648d70e60d8f8661c475da2be7ce7d120d1d96d505b2a9cacf92f5922c3c1266c0e0d3f8731c00a443cd7b05e317e874675038e709f0045d3e2f8e47ce4ffd6c SHA512 7da28e8493f318cd8b8a5e4f03f6f0deffc6b42ff9a4b9f304ccf684ea30dc85e0525804cd851ba1597f49d3500681d76c7fd7b6de08c1e479f1fdf4f91d0cae
diff --git a/dev-util/perf/perf-6.6.ebuild b/dev-util/perf/perf-6.6.ebuild
index 5f93ba5de347..206b06714a2f 100644
--- a/dev-util/perf/perf-6.6.ebuild
+++ b/dev-util/perf/perf-6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -31,7 +31,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit babeltrace bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
+IUSE="abi_mips_o32 abi_mips_n32 abi_mips_n64 audit babeltrace big-endian bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -223,11 +223,29 @@ perf_make() {
 		disable_libdw=1
 	fi
 
+	# perf directly invokes LD for linking without going through CC, on mips
+	# it is required to specify the emulation.  port of below buildroot patch
+	# https://patchwork.ozlabs.org/project/buildroot/patch/20170217105905.32151-1-Vincent.Riera@imgtec.com/
+	local linker="$(tc-getLD)"
+	if use mips
+	then
+		if use big-endian
+		then
+			use abi_mips_n64 && linker+=" -m elf64btsmip"
+			use abi_mips_n32 && linker+=" -m elf32btsmipn32"
+			use abi_mips_o32 && linker+=" -m elf32btsmip"
+		else
+			use abi_mips_n64 && linker+=" -m elf64ltsmip"
+			use abi_mips_n32 && linker+=" -m elf32ltsmipn32"
+			use abi_mips_o32 && linker+=" -m elf32ltsmip"
+		fi
+	fi
+
 	# FIXME: NO_CORESIGHT
 	local emakeargs=(
 		V=1 VF=1
 		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)"
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)"
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="${linker}" NM="$(tc-getNM)"
 		PKG_CONFIG="$(tc-getPKG_CONFIG)"
 		prefix="${EPREFIX}/usr" bindir_relative="bin"
 		tipdir="share/doc/${PF}"
-- 
cgit v1.2.3