diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-29 10:35:52 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-29 15:13:43 +0100 |
| commit | 0ba20cb7f23e1e47882f44add1a539db285fe604 (patch) | |
| tree | bbfb30e0f9835405864e4d1545e11aa7e4ce3cdc /gcc-12-subcmd-util.patch | |
| parent | 5351eeaf7fb73a38a41d710c76864be068df26ff (diff) | |
| download | kernel-0ba20cb7f23e1e47882f44add1a539db285fe604.tar.gz kernel-0ba20cb7f23e1e47882f44add1a539db285fe604.tar.xz kernel-0ba20cb7f23e1e47882f44add1a539db285fe604.zip | |
add patch for gcc12 to compile on rawhide againkernel-5.17.0-0.rc1.20220128git145d9b498fc8.79.vanilla.1.fc36
Diffstat (limited to 'gcc-12-subcmd-util.patch')
| -rw-r--r-- | gcc-12-subcmd-util.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/gcc-12-subcmd-util.patch b/gcc-12-subcmd-util.patch new file mode 100644 index 000000000..ac063292e --- /dev/null +++ b/gcc-12-subcmd-util.patch @@ -0,0 +1,35 @@ +From b3d2907a37c53f7379be8742bfbfe47aa2877bfc Mon Sep 17 00:00:00 2001 +From: "Justin M. Forbes" <jforbes@fedoraproject.org> +Date: Thu, 27 Jan 2022 15:33:37 -0600 +Subject: [PATCH] Fix subcmd-util for gcc 12 + +Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org> +--- + tools/lib/subcmd/subcmd-util.h | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/tools/lib/subcmd/subcmd-util.h b/tools/lib/subcmd/subcmd-util.h +index 794a375dad36..7009fc176636 100644 +--- a/tools/lib/subcmd/subcmd-util.h ++++ b/tools/lib/subcmd/subcmd-util.h +@@ -49,13 +49,12 @@ static NORETURN inline void die(const char *err, ...) + + static inline void *xrealloc(void *ptr, size_t size) + { +- void *ret = realloc(ptr, size); +- if (!ret && !size) +- ret = realloc(ptr, 1); ++ void *ret; ++ if (!size) ++ size = 1; ++ ret = realloc(ptr, size); + if (!ret) { + ret = realloc(ptr, size); +- if (!ret && !size) +- ret = realloc(ptr, 1); + if (!ret) + die("Out of memory, realloc failed"); + } +-- +2.34.1 + |