Skip to contentSkip to conversation

Revert "Makefile: Do not quote value for CONFIG_CC_IMPLICIT_FALLTHROUGH"

PATCH In review Masahiro Yamada 4 participants 4 messages Jan 20, 2022 – Jan 25, 2022

Subsystems (2)
Kbuild Generic include/asm header files
lore
Share & tools
lore

Masahiro Yamada

author
#0 lore raw

PATCH 1/1 Revert "Makefile: Do not quote value for CONFIG_CC_IMPLICIT_FALLTHROUGH"

This reverts commit cd8c917a56f20f48748dd43d9ae3caff51d5b987.

Commit 129ab0d2d9f3 ("kbuild: do not quote string values in include/config/auto.conf") provided the final solution.

Now reverting the temporary workaround.

Signed-off-by Masahiro Yamada <[email protected]>

---

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index 3f07f0f04475..c94559a97dca 100644
@@ -778,7 +778,7 @@ stackp-flags-$(CONFIG_STACKPROTECTOR_STRONG)      := -fstack-protector-strong
 KBUILD_CFLAGS += $(stackp-flags-y)
 
 KBUILD_CFLAGS-$(CONFIG_WERROR) += -Werror
-KBUILD_CFLAGS += $(KBUILD_CFLAGS-y) $(CONFIG_CC_IMPLICIT_FALLTHROUGH:"%"=%)
+KBUILD_CFLAGS += $(KBUILD_CFLAGS-y) $(CONFIG_CC_IMPLICIT_FALLTHROUGH)
 
 ifdef CONFIG_CC_IS_CLANG
 KBUILD_CPPFLAGS += -Qunused-arguments
Signature · 1 line
2.32.0
Reviewed-by on v1 1/1
#1 lore raw

+ Salvatore, Kees, Gustavo, Nathan

Quoted 9 lines · Masahiro Yamada

This reverts commit cd8c917a56f20f48748dd43d9ae3caff51d5b987.

Commit 129ab0d2d9f3 ("kbuild: do not quote string values in include/config/auto.conf") provided the final solution.

Now reverting the temporary workaround.

Signed-off-by Masahiro Yamada <[email protected]>
Reviewed-by Nick Desaulniers <[email protected]>
Quoted 21 lines

---

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -2
index 3f07f0f04475..c94559a97dca 100644
@@ -778,7 +778,7 @@ stackp-flags-$(CONFIG_STACKPROTECTOR_STRONG)      := -fstack-protector-strong
 KBUILD_CFLAGS += $(stackp-flags-y)
 
 KBUILD_CFLAGS-$(CONFIG_WERROR) += -Werror
-KBUILD_CFLAGS += $(KBUILD_CFLAGS-y) $(CONFIG_CC_IMPLICIT_FALLTHROUGH:"%"=%)
+KBUILD_CFLAGS += $(KBUILD_CFLAGS-y) $(CONFIG_CC_IMPLICIT_FALLTHROUGH)
 
 ifdef CONFIG_CC_IS_CLANG
 KBUILD_CPPFLAGS += -Qunused-arguments
--

2.32.0

Signature · 2 lines
Thanks,
~Nick Desaulniers
Reviewed-by
#2 lore raw
Quoted 6 lines · Nick Desaulniers

+ Salvatore, Kees, Gustavo, Nathan

Quoted 3 lines · Masahiro Yamada

This reverts commit cd8c917a56f20f48748dd43d9ae3caff51d5b987.

Quoted 8 lines
Quoted 6 lines

Commit 129ab0d2d9f3 ("kbuild: do not quote string values in include/config/auto.conf") provided the final solution.

Now reverting the temporary workaround.

Signed-off-by Masahiro Yamada <[email protected]>
Reviewed-by Nick Desaulniers <[email protected]>

Great!

Reviewed-by Gustavo A. R. Silva <[email protected]>

Thanks
--
Gustavo

Quoted 27 lines
Quoted 22 lines

---

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -2
index 3f07f0f04475..c94559a97dca 100644
@@ -778,7 +778,7 @@ stackp-flags-$(CONFIG_STACKPROTECTOR_STRONG)      := -fstack-protector-strong
 KBUILD_CFLAGS += $(stackp-flags-y)
 
 KBUILD_CFLAGS-$(CONFIG_WERROR) += -Werror
-KBUILD_CFLAGS += $(KBUILD_CFLAGS-y) $(CONFIG_CC_IMPLICIT_FALLTHROUGH:"%"=%)
+KBUILD_CFLAGS += $(KBUILD_CFLAGS-y) $(CONFIG_CC_IMPLICIT_FALLTHROUGH)
 
 ifdef CONFIG_CC_IS_CLANG
 KBUILD_CPPFLAGS += -Qunused-arguments
--

2.32.0

Signature · 2 lines
Thanks,
~Nick Desaulniers
Reviewed-by
#3 lore raw
In reply to Nick Desaulniers
Quoted 8 lines · Nick Desaulniers

+ Salvatore, Kees, Gustavo, Nathan

Quoted 5 lines · Masahiro Yamada

This reverts commit cd8c917a56f20f48748dd43d9ae3caff51d5b987.

Commit 129ab0d2d9f3 ("kbuild: do not quote string values in include/config/auto.conf") provided the final solution.

Oh nice!

Quoted 6 lines
Quoted 4 lines

Now reverting the temporary workaround.

Signed-off-by Masahiro Yamada <[email protected]>
Reviewed-by Nick Desaulniers <[email protected]>
Reviewed-by Kees Cook <[email protected]>

-Kees

Quoted 27 lines
Quoted 22 lines

---

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -2
index 3f07f0f04475..c94559a97dca 100644
@@ -778,7 +778,7 @@ stackp-flags-$(CONFIG_STACKPROTECTOR_STRONG)      := -fstack-protector-strong
 KBUILD_CFLAGS += $(stackp-flags-y)
 
 KBUILD_CFLAGS-$(CONFIG_WERROR) += -Werror
-KBUILD_CFLAGS += $(KBUILD_CFLAGS-y) $(CONFIG_CC_IMPLICIT_FALLTHROUGH:"%"=%)
+KBUILD_CFLAGS += $(KBUILD_CFLAGS-y) $(CONFIG_CC_IMPLICIT_FALLTHROUGH)
 
 ifdef CONFIG_CC_IS_CLANG
 KBUILD_CPPFLAGS += -Qunused-arguments
--

2.32.0

Signature · 2 lines
Thanks,
~Nick Desaulniers
Signature · 1 line
Kees Cook