From 53b010d6bc3339bcb93749732efe14d031df8621 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 10 Dec 2023 10:03:53 -0500 Subject: [PATCH] Drop kbuild-move-to-std-gnu11.patch Signed-off-by: Sasha Levin --- queue-5.15/kbuild-move-to-std-gnu11.patch | 158 ---------------------- queue-5.15/series | 1 - 2 files changed, 159 deletions(-) delete mode 100644 queue-5.15/kbuild-move-to-std-gnu11.patch diff --git a/queue-5.15/kbuild-move-to-std-gnu11.patch b/queue-5.15/kbuild-move-to-std-gnu11.patch deleted file mode 100644 index 733d7a83c37..00000000000 --- a/queue-5.15/kbuild-move-to-std-gnu11.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 6439890c47551e612037e8f410068d2c8b105211 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 8 Mar 2022 22:56:14 +0100 -Subject: Kbuild: move to -std=gnu11 - -From: Arnd Bergmann - -[ Upstream commit e8c07082a810fbb9db303a2b66b66b8d7e588b53 ] - -During a patch discussion, Linus brought up the option of changing -the C standard version from gnu89 to gnu99, which allows using variable -declaration inside of a for() loop. While the C99, C11 and later standards -introduce many other features, most of these are already available in -gnu89 as GNU extensions as well. - -An earlier attempt to do this when gcc-5 started defaulting to --std=gnu11 failed because at the time that caused warnings about -designated initializers with older compilers. Now that gcc-5.1 is -the minimum compiler version used for building kernels, that is no -longer a concern. Similarly, the behavior of 'inline' functions changes -between gnu89 using gnu_inline behavior and gnu11 using standard c99+ -behavior, but this was taken care of by defining 'inline' to include -__attribute__((gnu_inline)) in order to allow building with clang a -while ago. - -Nathan Chancellor reported a new -Wdeclaration-after-statement -warning that appears in a system header on arm, this still needs a -workaround. - -The differences between gnu99, gnu11, gnu1x and gnu17 are fairly -minimal and mainly impact warnings at the -Wpedantic level that the -kernel never enables. Between these, gnu11 is the newest version -that is supported by all supported compiler versions, though it is -only the default on gcc-5, while all other supported versions of -gcc or clang default to gnu1x/gnu17. - -Link: https://lore.kernel.org/lkml/CAHk-=wiyCH7xeHcmiFJ-YgXUy2Jaj7pnkdKpcovt8fYbVFW3TA@mail.gmail.com/ -Link: https://github.com/ClangBuiltLinux/linux/issues/1603 -Suggested-by: Linus Torvalds -Acked-by: Marco Elver -Acked-by: Jani Nikula -Acked-by: David Sterba -Tested-by: Sedat Dilek -Reviewed-by: Alex Shi -Reviewed-by: Nick Desaulniers -Reviewed-by: Miguel Ojeda -Signed-off-by: Arnd Bergmann -Reviewed-by: Nathan Chancellor -Signed-off-by: Masahiro Yamada -Stable-dep-of: cbf54f37600e ("platform/x86: wmi: Skip blocks with zero instances") -Signed-off-by: Sasha Levin ---- - Documentation/process/programming-language.rst | 6 +++--- - .../translations/it_IT/process/programming-language.rst | 4 ++-- - .../translations/zh_CN/process/programming-language.rst | 3 +-- - .../translations/zh_TW/process/programming-language.rst | 3 +-- - Makefile | 4 ++-- - arch/arm64/kernel/vdso32/Makefile | 2 +- - 6 files changed, 10 insertions(+), 12 deletions(-) - -diff --git a/Documentation/process/programming-language.rst b/Documentation/process/programming-language.rst -index ec474a70a02fa..5fc9160ca1fa5 100644 ---- a/Documentation/process/programming-language.rst -+++ b/Documentation/process/programming-language.rst -@@ -5,9 +5,9 @@ Programming Language - - The kernel is written in the C programming language [c-language]_. - More precisely, the kernel is typically compiled with ``gcc`` [gcc]_ --under ``-std=gnu89`` [gcc-c-dialect-options]_: the GNU dialect of ISO C90 --(including some C99 features). ``clang`` [clang]_ is also supported, see --docs on :ref:`Building Linux with Clang/LLVM `. -+under ``-std=gnu11`` [gcc-c-dialect-options]_: the GNU dialect of ISO C11. -+``clang`` [clang]_ is also supported, see docs on -+:ref:`Building Linux with Clang/LLVM `. - - This dialect contains many extensions to the language [gnu-extensions]_, - and many of them are used within the kernel as a matter of course. -diff --git a/Documentation/translations/it_IT/process/programming-language.rst b/Documentation/translations/it_IT/process/programming-language.rst -index 41db2598ce119..c1a9b481a6f99 100644 ---- a/Documentation/translations/it_IT/process/programming-language.rst -+++ b/Documentation/translations/it_IT/process/programming-language.rst -@@ -10,8 +10,8 @@ Linguaggio di programmazione - - Il kernel è scritto nel linguaggio di programmazione C [it-c-language]_. - Più precisamente, il kernel viene compilato con ``gcc`` [it-gcc]_ usando --l'opzione ``-std=gnu89`` [it-gcc-c-dialect-options]_: il dialetto GNU --dello standard ISO C90 (con l'aggiunta di alcune funzionalità da C99). -+l'opzione ``-std=gnu11`` [it-gcc-c-dialect-options]_: il dialetto GNU -+dello standard ISO C11. - Linux supporta anche ``clang`` [it-clang]_, leggete la documentazione - :ref:`Building Linux with Clang/LLVM `. - -diff --git a/Documentation/translations/zh_CN/process/programming-language.rst b/Documentation/translations/zh_CN/process/programming-language.rst -index 2a47a1d2ec20f..fabdc338dbfbc 100644 ---- a/Documentation/translations/zh_CN/process/programming-language.rst -+++ b/Documentation/translations/zh_CN/process/programming-language.rst -@@ -9,8 +9,7 @@ - ============ - - 内核是用C语言 :ref:`c-language ` 编写的。更准确地说，内核通常是用 :ref:`gcc ` --在 ``-std=gnu89`` :ref:`gcc-c-dialect-options ` 下编译的：ISO C90的 GNU 方言（ --包括一些C99特性） -+在 ``-std=gnu11`` :ref:`gcc-c-dialect-options ` 下编译的：ISO C11的 GNU 方言 - - 这种方言包含对语言 :ref:`gnu-extensions ` 的许多扩展，当然，它们许多都在内核中使用。 - -diff --git a/Documentation/translations/zh_TW/process/programming-language.rst b/Documentation/translations/zh_TW/process/programming-language.rst -index 54e3699eadf85..144bdaf81a416 100644 ---- a/Documentation/translations/zh_TW/process/programming-language.rst -+++ b/Documentation/translations/zh_TW/process/programming-language.rst -@@ -12,8 +12,7 @@ - ============ - - 內核是用C語言 :ref:`c-language ` 編寫的。更準確地說，內核通常是用 :ref:`gcc ` --在 ``-std=gnu89`` :ref:`gcc-c-dialect-options ` 下編譯的：ISO C90的 GNU 方言（ --包括一些C99特性） -+在 ``-std=gnu11`` :ref:`gcc-c-dialect-options ` 下編譯的：ISO C11的 GNU 方言 - - 這種方言包含對語言 :ref:`gnu-extensions ` 的許多擴展，當然，它們許多都在內核中使用。 - -diff --git a/Makefile b/Makefile -index 5976e71522607..fb1517f05c3ff 100644 ---- a/Makefile -+++ b/Makefile -@@ -524,7 +524,7 @@ KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ - -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__ - KBUILD_AFLAGS_KERNEL := - KBUILD_CFLAGS_KERNEL := -@@ -809,7 +809,7 @@ KBUILD_CFLAGS += $(KBUILD_CFLAGS-y) - - ifdef CONFIG_CC_IS_CLANG - KBUILD_CPPFLAGS += -Qunused-arguments --# The kernel builds with '-std=gnu89' so use of GNU extensions is acceptable. -+# The kernel builds with '-std=gnu11' so use of GNU extensions is acceptable. - KBUILD_CFLAGS += -Wno-gnu - # CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the - # source of a reference will be _MergedGlobals and not on of the whitelisted names. -diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile -index 50cb1ec092ae5..d7f5b140a5d2a 100644 ---- a/arch/arm64/kernel/vdso32/Makefile -+++ b/arch/arm64/kernel/vdso32/Makefile -@@ -77,7 +77,7 @@ VDSO_CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -Werror-implicit-function-declaration \ - -Wno-format-security \ - -Wdeclaration-after-statement \ -- -std=gnu89 -+ -std=gnu11 - VDSO_CFLAGS += -O2 - # Some useful compiler-dependent flags from top-level Makefile - VDSO_CFLAGS += $(call cc32-option,-Wdeclaration-after-statement,) --- -2.42.0 - diff --git a/queue-5.15/series b/queue-5.15/series index f3d0e580572..98bb4f5ec98 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -12,7 +12,6 @@ platform-x86-asus-wmi-simplify-tablet-mode-switch-pr.patch platform-x86-asus-wmi-simplify-tablet-mode-switch-ha.patch platform-x86-asus-wmi-move-i8042-filter-install-to-s.patch of-dynamic-fix-of_reconfig_get_state_change-return-v.patch -kbuild-move-to-std-gnu11.patch platform-x86-wmi-allow-duplicate-guids-for-drivers-t.patch platform-x86-wmi-skip-blocks-with-zero-instances.patch ipv6-fix-potential-null-deref-in-fib6_add.patch -- 2.47.3