commit:     b64c41bcec3c8ebdab8e5bea77081f20864deab2
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  1 12:02:25 2024 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Nov  1 12:02:25 2024 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=b64c41bc

Removed libsubcmd patch

Removed:
2950_libsubcmd-silence-compiler-warning.patch

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 0000_README                                   |  4 ---
 2950_libsubcmd-silence-compiler-warning.patch | 46 ---------------------------
 2 files changed, 50 deletions(-)

diff --git a/0000_README b/0000_README
index 590cb13c..64601acf 100644
--- a/0000_README
+++ b/0000_README
@@ -327,10 +327,6 @@ Patch:  
2932_gcc14-objtool-Fix-calloc-call-for-new-Walloc-size.patch
 From:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 Desc:   objtool: Fix calloc call for new -Walloc-size
 
-Patch:  2950_libsubcmd-silence-compiler-warning.patch
-From:   
https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=7a4ffec9fd54ea27395e24dff726dbf58e2fe06b
-Desc:   libsubcmd: Silence compiler warning
-
 Patch:  2951_libbpf-Prevent-compiler-warnings-errors.patch
 From:   
https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=7f4ec77f3fee41dd6a41f03a40703889e6e8f7b2
 Desc:   libbpf: Prevent compiler warnings/errors

diff --git a/2950_libsubcmd-silence-compiler-warning.patch 
b/2950_libsubcmd-silence-compiler-warning.patch
deleted file mode 100644
index efc9d854..00000000
--- a/2950_libsubcmd-silence-compiler-warning.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 7a4ffec9fd54ea27395e24dff726dbf58e2fe06b Mon Sep 17 00:00:00 2001
-From: Eder Zulian <[email protected]>
-Date: Tue, 22 Oct 2024 19:23:29 +0200
-Subject: libsubcmd: Silence compiler warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Initialize the pointer 'o' in options__order to NULL to prevent a
-compiler warning/error which is observed when compiling with the '-Og'
-option, but is not emitted by the compiler with the current default
-compilation options.
-
-For example, when compiling libsubcmd with
-
- $ make "EXTRA_CFLAGS=-Og" -C tools/lib/subcmd/ clean all
-
-Clang version 17.0.6 and GCC 13.3.1 fail to compile parse-options.c due
-to following error:
-
-  parse-options.c: In function ‘options__order’:
-  parse-options.c:832:9: error: ‘o’ may be used uninitialized 
[-Werror=maybe-uninitialized]
-    832 |         memcpy(&ordered[nr_opts], o, sizeof(*o));
-        |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  parse-options.c:810:30: note: ‘o’ was declared here
-    810 |         const struct option *o, *p = opts;
-        |                              ^
-  cc1: all warnings being treated as errors
-
-Signed-off-by: Eder Zulian <[email protected]>
-Signed-off-by: Andrii Nakryiko <[email protected]>
-Acked-by: Arnaldo Carvalho de Melo <[email protected]>
-Acked-by: Jiri Olsa <[email protected]>
-Link: https://lore.kernel.org/bpf/[email protected]
----
---- a/tools/lib/subcmd/parse-options.c 2024-11-01 07:47:50.842865849 -0400
-+++ b/tools/lib/subcmd/parse-options.c 2024-11-01 07:48:28.656516527 -0400
-@@ -807,7 +807,7 @@ static int option__cmp(const void *va, c
- static struct option *options__order(const struct option *opts)
- {
-       int nr_opts = 0, nr_group = 0, len;
--      const struct option *o = opts;
-+  const struct option *o = NULL, *p = opts;
-       struct option *opt, *ordered, *group;
- 
-       for (o = opts; o->type != OPTION_END; o++)

Reply via email to