Skip to contentSkip to conversation

Makefile: Move -Wno-unused-but-set-variable out of GCC only block

PATCH In review Nathan Chancellor 3 participants 4 messages Jun 23, 2021 – Jun 25, 2021 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Makefile: Move -Wno-unused-but-set-variable out of GCC only block

commit 885480b084696331bea61a4f7eba10652999a9c1 upstream.

Currently, -Wunused-but-set-variable is only supported by GCC so it is disabled unconditionally in a GCC only block (it is enabled with W=1). clang currently has its implementation for this warning in review so preemptively move this statement out of the GCC only block and wrap it with cc-disable-warning so that both compilers function the same.

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Makefile +1 -2
index 9ff7a4b7b8cb..cda7a18b925a 100644
@@ -716,12 +716,11 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)
 # See modpost pattern 2
 KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)
 KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)
-else
+endif
 
 # These warnings generated too much noise in a regular build.
 # Use make W=1 to enable them (see scripts/Makefile.extrawarn)
 KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)
-endif
 
 KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
 ifdef CONFIG_FRAME_POINTER

base-commit: eb575cd5d7f60241d016fdd13a9e86d962093c9b

Signature · 1 line
2.32.0.93.g670b81a890
maintainer
#1 lore raw
Quoted 8 lines · Nathan Chancellor

commit 885480b084696331bea61a4f7eba10652999a9c1 upstream.

Currently, -Wunused-but-set-variable is only supported by GCC so it is disabled unconditionally in a GCC only block (it is enabled with W=1). clang currently has its implementation for this warning in review so preemptively move this statement out of the GCC only block and wrap it with cc-disable-warning so that both compilers function the same.

Quoted 7 lines

Can we just take the above patch instead?

Signature · 2 lines
Thanks,
Sasha
#2 lore raw
Quoted 17 lines · Sasha Levin
Quoted 8 lines · Nathan Chancellor

commit 885480b084696331bea61a4f7eba10652999a9c1 upstream.

Currently, -Wunused-but-set-variable is only supported by GCC so it is disabled unconditionally in a GCC only block (it is enabled with W=1). clang currently has its implementation for this warning in review so preemptively move this statement out of the GCC only block and wrap it with cc-disable-warning so that both compilers function the same.

Quoted 7 lines
Quoted 1 line

Can we just take the above patch instead?

No because that patch has a prerequisite of commit a035d552a93b ("Makefile: Globally enable fall-through warning"), which is not suitable for stable because there were hundreds of warnings fixed before that was enabled.

Cheers,
Nathan

#3 lore raw
In reply to Nathan Chancellor
Quoted 16 lines · Nathan Chancellor

commit 885480b084696331bea61a4f7eba10652999a9c1 upstream.

Currently, -Wunused-but-set-variable is only supported by GCC so it is disabled unconditionally in a GCC only block (it is enabled with W=1). clang currently has its implementation for this warning in review so preemptively move this statement out of the GCC only block and wrap it with cc-disable-warning so that both compilers function the same.

Quoted 3 lines
---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Now queued up, thanks.

greg k-h