From 6b4bdab91820f2346988e937a554921d8b234406 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Sun, 16 Oct 2022 20:36:03 +0200 Subject: generic: 5.10: refresh backport patches Refresh backport patches for kernel 5.10. Signed-off-by: Christian Marangi --- ...5.17-01-Kbuild-use-Wdeclaration-after-statement.patch | 16 ++++++++-------- .../005-v5.17-02-Kbuild-move-to-std-gnu11.patch | 6 +++--- ...7-03-Kbuild-use-std-gnu11-for-KBUILD_USERCFLAGS.patch | 5 +++-- .../backport-5.10/011-kbuild-export-SUBARCH.patch | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) (limited to 'target') diff --git a/target/linux/generic/backport-5.10/005-v5.17-01-Kbuild-use-Wdeclaration-after-statement.patch b/target/linux/generic/backport-5.10/005-v5.17-01-Kbuild-use-Wdeclaration-after-statement.patch index dd8a1b445d..b01507e653 100644 --- a/target/linux/generic/backport-5.10/005-v5.17-01-Kbuild-use-Wdeclaration-after-statement.patch +++ b/target/linux/generic/backport-5.10/005-v5.17-01-Kbuild-use-Wdeclaration-after-statement.patch @@ -39,13 +39,13 @@ Signed-off-by: Masahiro Yamada +++ b/Makefile @@ -416,7 +416,8 @@ HOSTCXX = g++ endif - + export KBUILD_USERCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \ - -O2 -fomit-frame-pointer -std=gnu89 + -O2 -fomit-frame-pointer -std=gnu89 \ + -Wdeclaration-after-statement export KBUILD_USERLDFLAGS := - + KBUILD_HOSTCFLAGS := $(KBUILD_USERCFLAGS) $(HOST_LFS_CFLAGS) $(HOSTCFLAGS) --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -61,13 +61,13 @@ Signed-off-by: Masahiro Yamada +++ b/scripts/mod/modpost.c @@ -844,8 +844,10 @@ static int match(const char *sym, const { - const char *p; - while (*pat) { + const char *p; + while (*pat) { + const char *endp; + - p = *pat++; + p = *pat++; - const char *endp = p + strlen(p) - 1; + endp = p + strlen(p) - 1; - - /* "*foo*" */ - if (*p == '*' && *endp == '*') { + + /* "*foo*" */ + if (*p == '*' && *endp == '*') { diff --git a/target/linux/generic/backport-5.10/005-v5.17-02-Kbuild-move-to-std-gnu11.patch b/target/linux/generic/backport-5.10/005-v5.17-02-Kbuild-move-to-std-gnu11.patch index 7938fe5026..c56cecfb71 100644 --- a/target/linux/generic/backport-5.10/005-v5.17-02-Kbuild-move-to-std-gnu11.patch +++ b/target/linux/generic/backport-5.10/005-v5.17-02-Kbuild-move-to-std-gnu11.patch @@ -50,9 +50,9 @@ Signed-off-by: Masahiro Yamada --- a/Makefile +++ b/Makefile @@ -498,7 +498,7 @@ KBUILD_CFLAGS := -Wall -Wundef -Werror - -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ - -Werror=implicit-function-declaration -Werror=implicit-int \ - -Werror=return-type -Wno-format-security \ + -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ + -Werror=implicit-function-declaration -Werror=implicit-int \ + -Werror=return-type -Wno-format-security \ - -std=gnu89 + -std=gnu11 KBUILD_CPPFLAGS := -D__KERNEL__ diff --git a/target/linux/generic/backport-5.10/005-v5.17-03-Kbuild-use-std-gnu11-for-KBUILD_USERCFLAGS.patch b/target/linux/generic/backport-5.10/005-v5.17-03-Kbuild-use-std-gnu11-for-KBUILD_USERCFLAGS.patch index 34b5b653ae..e8d7c40d11 100644 --- a/target/linux/generic/backport-5.10/005-v5.17-03-Kbuild-use-std-gnu11-for-KBUILD_USERCFLAGS.patch +++ b/target/linux/generic/backport-5.10/005-v5.17-03-Kbuild-use-std-gnu11-for-KBUILD_USERCFLAGS.patch @@ -34,9 +34,10 @@ Signed-off-by: Masahiro Yamada +++ b/Makefile @@ -416,7 +416,7 @@ HOSTCXX = g++ endif - + export KBUILD_USERCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \ - -O2 -fomit-frame-pointer -std=gnu89 \ + -O2 -fomit-frame-pointer -std=gnu11 \ - -Wdeclaration-after-statement + -Wdeclaration-after-statement export KBUILD_USERLDFLAGS := + diff --git a/target/linux/generic/backport-5.10/011-kbuild-export-SUBARCH.patch b/target/linux/generic/backport-5.10/011-kbuild-export-SUBARCH.patch index bb99e4ddbf..f7e2d207cc 100644 --- a/target/linux/generic/backport-5.10/011-kbuild-export-SUBARCH.patch +++ b/target/linux/generic/backport-5.10/011-kbuild-export-SUBARCH.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -507,7 +507,7 @@ KBUILD_LDFLAGS_MODULE := +@@ -508,7 +508,7 @@ KBUILD_LDFLAGS_MODULE := KBUILD_LDFLAGS := CLANG_FLAGS := -- cgit v1.2.3