summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-03-09 16:19:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-11 00:08:41 +0000
commit658a8931e2c7e80d5e26e4f45e75b942661f5f60 (patch)
tree61e8c8c47afce03ab161a12e7ee18bd9904d2c5b
parent9dd103dde5b6b139254466fa5a52571ac82438d0 (diff)
downloadpoky-658a8931e2c7e80d5e26e4f45e75b942661f5f60.tar.gz
stress-ng: remove obsolete patch
Upstream has disabled gold support altogether: https://github.com/ColinIanKing/stress-ng/commit/e65f517917fc682784bfa1b3cb53de3f3263b094 (From OE-Core rev: ca7578588ad9bb7a9e6678c1f658da62ffb735f8) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch35
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb1
2 files changed, 0 insertions, 36 deletions
diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch
deleted file mode 100644
index 6742e0d256..0000000000
--- a/meta/recipes-extended/stress-ng/stress-ng/0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 5d6fa06b3104637289178a471dd28d7bf3e14e76 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 3 Jan 2023 11:00:09 -0800
4Subject: [PATCH] Pass LD_GOLD=1 via makefile to enable gold linker
5
6Current logic prefers gold if a toolchain has gold linker installed and
7does not offer any option to chose default linker which might not be
8gold linker. Its better to pass this control to user instead of auto
9detecting and deciding.
10
11Upstream-Status: Submitted [https://github.com/ColinIanKing/stress-ng/pull/251]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14---
15 Makefile | 7 +++++++
16 1 file changed, 7 insertions(+)
17
18diff --git a/Makefile b/Makefile
19index 7a969aba..583ae04f 100644
20--- a/Makefile
21+++ b/Makefile
22@@ -93,6 +93,13 @@ endif
23 #CFLAGS += -Weverything
24 #endif
25
26+#
27+# Use gold linker
28+#
29+ifeq ($(LD_GOLD),1)
30+LDFLAGS += -fuse-ld=gold
31+endif
32+
33 GREP = grep
34 #
35 # SunOS requires special grep for -e support
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb b/meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb
index e891bb738b..74d8356812 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.15.04.bb
@@ -6,7 +6,6 @@ LICENSE = "GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ 8SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \
9 file://0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch \
10 " 9 "
11SRCREV = "b9a437ec790ad4bcc71d31b2df39d4a601c55fa8" 10SRCREV = "b9a437ec790ad4bcc71d31b2df39d4a601c55fa8"
12S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"