selftests/openat2, fchmodat2: fix clang build failures
v2 cover selftests/openat2, fchmodat2: fix clang build failures
These two subsystems require very similar fixes, so I'm sending them out together.
Changes since the first version:
1) Rebased onto Linux 6.10-rc1.
2) Added a Reviewed-by tag from Ryan Roberts. See [1] for that.
Related work: I've sent a separate fix that allows "make CC=clang" to work in addition to "make LLVM=1" [2].
[1] https://lore.kernel.org/[email protected]
[2] https://lore.kernel.org/[email protected]
John Hubbard (2):
selftests/openat2: fix clang build failures: -static-libasan,
LOCAL_HDRS
selftests/fchmodat2: fix clang build failure due to -static-libasan
tools/testing/selftests/fchmodat2/Makefile | 11 ++++++++++- tools/testing/selftests/openat2/Makefile | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-)
base-commit: cc8ed4d0a8486c7472cd72ec3c19957e509dc68c
Signature · 1 line
2.45.1
PATCH v2 1/2 selftests/openat2: fix clang build failures: -static-libasan, LOCAL_HDRS
When building with clang via:
make LLVM=1 -C tools/testing/selftests
two distinct failures occur:
1) gcc requires -static-libasan in order to ensure that Address Sanitizer's library is the first one loaded. However, this leads to build failures on clang, when building via:
make LLVM=1 -C tools/testing/selftests
However, clang already does the right thing by default: it statically links the Address Sanitizer if -fsanitize is specified. Therefore, fix this by simply omitting -static-libasan for clang builds. And leave behind a comment, because the whole reason for static linking might not be obvious.
2) clang won't accept invocations of this form, but gcc will:
$(CC) file1.c header2.h
Fix this by using selftests/lib.mk facilities for tracking local header file dependencies: add them to LOCAL_HDRS, leaving only the .c files to be passed to the compiler.
--- tools/testing/selftests/openat2/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
tools/testing/selftests/openat2/Makefile +12 -2
@@ -1,8 +1,18 @@ # SPDX-License-Identifier: GPL-2.0-or-later -CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined -static-libasan +CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined TEST_GEN_PROGS := openat2_test resolve_test rename_attack_test +# gcc requires -static-libasan in order to ensure that Address Sanitizer's +# library is the first one loaded. However, clang already statically links the +# Address Sanitizer if -fsanitize is specified. Therefore, simply omit +# -static-libasan for clang builds. +ifeq ($(LLVM),) + CFLAGS += -static-libasan +endif + +LOCAL_HDRS += helpers.h + include ../lib.mk -$(TEST_GEN_PROGS): helpers.c helpers.h +$(TEST_GEN_PROGS): helpers.c
Signature · 1 line
2.45.1
Re: [PATCH v2 1/2] selftests/openat2: fix clang build failures: -static-libasan, LOCAL_HDRS
Quoted 20 lines · John Hubbard
When building with clang via:
make LLVM=1 -C
tools/testing/selfteststwo distinct failures occur:
1) gcc requires -static-libasan in order to ensure that Address Sanitizer's library is the first one loaded. However, this leads to build failures on clang, when building via:
make LLVM=1 -C
tools/testing/selftestsHowever, clang already does the right thing by default: it statically links the Address Sanitizer if -fsanitize is specified. Therefore, fix this by simply omitting -static-libasan for clang builds. And leave behind a comment, because the whole reason for static linking might not be obvious.
2) clang won't accept invocations of this form, but gcc will:
Quoted 8 lines
$(CC) file1.c header2.hFix this by using
selftests/lib.mkfacilities for tracking local header file dependencies: add them toLOCAL_HDRS, leaving only the .c files to be passed to the compiler.Reviewed-by Ryan Roberts <[email protected]>Signed-off-by John Hubbard <[email protected]>
Assuming that $(LLVM) is the correct conditional to test for:
Quoted 33 lines
--- tools/testing/selftests/openat2/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)tools/testing/selftests/openat2/Makefile +12
-2@@ -1,8 +1,18 @@ # SPDX-License-Identifier: GPL-2.0-or-later -CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined -static-libasan +CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined TEST_GEN_PROGS := openat2_test resolve_test rename_attack_test +# gcc requires -static-libasan in order to ensure that Address Sanitizer's +# library is the first one loaded. However, clang already statically links the +# Address Sanitizer if -fsanitize is specified. Therefore, simply omit +# -static-libasan for clang builds. +ifeq ($(LLVM),) + CFLAGS += -static-libasan +endif + +LOCAL_HDRS += helpers.h + include ../lib.mk -$(TEST_GEN_PROGS): helpers.c helpers.h +$(TEST_GEN_PROGS): helpers.cSignature · 1 line
2.45.1
Re: [PATCH v2 1/2] selftests/openat2: fix clang build failures: -static-libasan, LOCAL_HDRS
In reply to John HubbardQuoted 20 lines · John Hubbard
When building with clang via:
make LLVM=1 -C
tools/testing/selfteststwo distinct failures occur:
1) gcc requires -static-libasan in order to ensure that Address Sanitizer's library is the first one loaded. However, this leads to build failures on clang, when building via:
make LLVM=1 -C
tools/testing/selftestsHowever, clang already does the right thing by default: it statically links the Address Sanitizer if -fsanitize is specified. Therefore, fix this by simply omitting -static-libasan for clang builds. And leave behind a comment, because the whole reason for static linking might not be obvious.
2) clang won't accept invocations of this form, but gcc will:
Quoted 8 lines
$(CC) file1.c header2.hFix this by using
selftests/lib.mkfacilities for tracking local header file dependencies: add them toLOCAL_HDRS, leaving only the .c files to be passed to the compiler.Reviewed-by Ryan Roberts <[email protected]>Signed-off-by John Hubbard <[email protected]>
Assuming that $(LLVM) is the correct conditional to test for:
Quoted 33 lines
--- tools/testing/selftests/openat2/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)tools/testing/selftests/openat2/Makefile +12
-2@@ -1,8 +1,18 @@ # SPDX-License-Identifier: GPL-2.0-or-later -CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined -static-libasan +CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined TEST_GEN_PROGS := openat2_test resolve_test rename_attack_test +# gcc requires -static-libasan in order to ensure that Address Sanitizer's +# library is the first one loaded. However, clang already statically links the +# Address Sanitizer if -fsanitize is specified. Therefore, simply omit +# -static-libasan for clang builds. +ifeq ($(LLVM),) + CFLAGS += -static-libasan +endif + +LOCAL_HDRS += helpers.h + include ../lib.mk -$(TEST_GEN_PROGS): helpers.c helpers.h +$(TEST_GEN_PROGS): helpers.cSignature · 1 line
2.45.1
PATCH v2 2/2 selftests/fchmodat2: fix clang build failure due to -static-libasan
In reply to John Hubbardgcc requires -static-libasan in order to ensure that Address Sanitizer's library is the first one loaded. However, this leads to build failures on clang, when building via:
make LLVM=1 -C tools/testing/selftests
However, clang already does the right thing by default: it statically links the Address Sanitizer if -fsanitize is specified. Therefore, simply omit -static-libasan for clang builds. And leave behind a comment, because the whole reason for static linking might not be obvious.
--- tools/testing/selftests/fchmodat2/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
tools/testing/selftests/fchmodat2/Makefile +10 -1
@@ -1,6 +1,15 @@ # SPDX-License-Identifier: GPL-2.0-or-later -CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined -static-libasan $(KHDR_INCLUDES) +CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined $(KHDR_INCLUDES) + +# gcc requires -static-libasan in order to ensure that Address Sanitizer's +# library is the first one loaded. However, clang already statically links the +# Address Sanitizer if -fsanitize is specified. Therefore, simply omit +# -static-libasan for clang builds. +ifeq ($(LLVM),) + CFLAGS += -static-libasan +endif + TEST_GEN_PROGS := fchmodat2_test include ../lib.mk
Signature · 1 line
2.45.1
Re: [PATCH v2 2/2] selftests/fchmodat2: fix clang build failure due to -static-libasan
Quoted 6 lines · John Hubbard
gcc requires -static-libasan in order to ensure that Address Sanitizer's library is the first one loaded. However, this leads to build failures on clang, when building via:
make LLVM=1 -C
tools/testing/selftests
Quoted 8 lines
However, clang already does the right thing by default: it statically links the Address Sanitizer if -fsanitize is specified. Therefore, simply omit -static-libasan for clang builds. And leave behind a comment, because the whole reason for static linking might not be obvious.
Cc Ryan Roberts <[email protected]>Signed-off-by John Hubbard <[email protected]>
Assuming that $(LLVM) is the correct conditional to test for:
Quoted 29 lines
--- tools/testing/selftests/fchmodat2/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)tools/testing/selftests/fchmodat2/Makefile +10
-1@@ -1,6 +1,15 @@ # SPDX-License-Identifier: GPL-2.0-or-later -CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined -static-libasan $(KHDR_INCLUDES) +CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined $(KHDR_INCLUDES) + +# gcc requires -static-libasan in order to ensure that Address Sanitizer's +# library is the first one loaded. However, clang already statically links the +# Address Sanitizer if -fsanitize is specified. Therefore, simply omit +# -static-libasan for clang builds. +ifeq ($(LLVM),) + CFLAGS += -static-libasan +endif + TEST_GEN_PROGS := fchmodat2_test include ../lib.mkSignature · 1 line
2.45.1
Shuah Khan
maintainerQuoted 20 lines · John Hubbard
These two subsystems require very similar fixes, so I'm sending them out together.
Changes since the first version:
1) Rebased onto Linux 6.10-rc1.
2) Added a Reviewed-by tag from Ryan Roberts. See [1] for that.
Related work: I've sent a separate fix that allows "make CC=clang" to work in addition to "make LLVM=1" [2].
[1] https://lore.kernel.org/[email protected]
[2] https://lore.kernel.org/[email protected]John Hubbard (2):
selftests/openat2: fix clang build failures: -static-libasan,
LOCAL_HDRS
selftests/fchmodat2: fix clang build failure due to -static-libasan
Quoted 6 lines
tools/testing/selftests/fchmodat2/Makefile | 11 ++++++++++- tools/testing/selftests/openat2/Makefile | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-)base-commit:
cc8ed4d0a8486c7472cd72ec3c19957e509dc68c
Applied to linux-kselftest fixes for Linux 6.10 next rc
thanks,
-- Shuah