* [PATCH] kbuild: Switch to 'f' variants of integrated assembler flag
@ 2021-08-16 20:36 Nathan Chancellor
2021-08-16 20:48 ` Nick Desaulniers
2021-08-16 20:52 ` [PATCH v2] " Nathan Chancellor
0 siblings, 2 replies; 5+ messages in thread
From: Nathan Chancellor @ 2021-08-16 20:36 UTC (permalink / raw)
To: Masahiro Yamada, Nick Desaulniers
Cc: linux-kbuild, linux-kernel, clang-built-linux, Nathan Chancellor
It has been brought up a few times in various code reviews that clang
3.5 introduced -f{,no-}integrated-as as the preferred way to enable and
disable the integrated assembler, mentioning that -{no-,}integrated-as
are now considered legacy flags.
Switch the kernel over to using those variants in case there is ever a
time where clang decides to remove the non-'f' variants of the flag.
Link: https://releases.llvm.org/3.5.0/tools/clang/docs/ReleaseNotes.html#new-compiler-flags
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
scripts/Makefile.clang | 4 ++--
scripts/as-version.sh | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/Makefile.clang b/scripts/Makefile.clang
index 3ae63bd35582..4cce8fd0779c 100644
--- a/scripts/Makefile.clang
+++ b/scripts/Makefile.clang
@@ -23,11 +23,11 @@ CLANG_FLAGS += --target=$(notdir $(CROSS_COMPILE:%-=%))
endif # CROSS_COMPILE
ifeq ($(LLVM_IAS),0)
-CLANG_FLAGS += -no-integrated-as
+CLANG_FLAGS += -fno-integrated-as
GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
else
-CLANG_FLAGS += -integrated-as
+CLANG_FLAGS += -fintegrated-as
endif
CLANG_FLAGS += -Werror=unknown-warning-option
KBUILD_CFLAGS += $(CLANG_FLAGS)
diff --git a/scripts/as-version.sh b/scripts/as-version.sh
index 8b9410e329df..a0fc366728f1 100755
--- a/scripts/as-version.sh
+++ b/scripts/as-version.sh
@@ -21,13 +21,13 @@ get_canonical_version()
echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0}))
}
-# Clang fails to handle -Wa,--version unless -no-integrated-as is given.
-# We check -(f)integrated-as, expecting it is explicitly passed in for the
+# Clang fails to handle -Wa,--version unless -fno-integrated-as is given.
+# We check -fintegrated-as, expecting it is explicitly passed in for the
# integrated assembler case.
check_integrated_as()
{
while [ $# -gt 0 ]; do
- if [ "$1" = -integrated-as -o "$1" = -fintegrated-as ]; then
+ if [ "$1" = -fintegrated-as ]; then
# For the intergrated assembler, we do not check the
# version here. It is the same as the clang version, and
# it has been already checked by scripts/cc-version.sh.
base-commit: f12b034afeb3a977bbb1c6584dedc0f3dc666f14
--
2.33.0.rc2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] kbuild: Switch to 'f' variants of integrated assembler flag
2021-08-16 20:36 [PATCH] kbuild: Switch to 'f' variants of integrated assembler flag Nathan Chancellor
@ 2021-08-16 20:48 ` Nick Desaulniers
2021-08-16 20:50 ` Nathan Chancellor
2021-08-16 20:52 ` [PATCH v2] " Nathan Chancellor
1 sibling, 1 reply; 5+ messages in thread
From: Nick Desaulniers @ 2021-08-16 20:48 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Masahiro Yamada, linux-kbuild, linux-kernel, clang-built-linux
On Mon, Aug 16, 2021 at 1:37 PM Nathan Chancellor <nathan@kernel.org> wrote:
>
> It has been brought up a few times in various code reviews that clang
> 3.5 introduced -f{,no-}integrated-as as the preferred way to enable and
> disable the integrated assembler, mentioning that -{no-,}integrated-as
> are now considered legacy flags.
>
> Switch the kernel over to using those variants in case there is ever a
> time where clang decides to remove the non-'f' variants of the flag.
>
> Link: https://releases.llvm.org/3.5.0/tools/clang/docs/ReleaseNotes.html#new-compiler-flags
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Thanks for the patch! Want to fix
tools/testing/selftests/rseq/Makefile and
tools/testing/selftests/sched/Makefile, too? Either way...
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> ---
> scripts/Makefile.clang | 4 ++--
> scripts/as-version.sh | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/scripts/Makefile.clang b/scripts/Makefile.clang
> index 3ae63bd35582..4cce8fd0779c 100644
> --- a/scripts/Makefile.clang
> +++ b/scripts/Makefile.clang
> @@ -23,11 +23,11 @@ CLANG_FLAGS += --target=$(notdir $(CROSS_COMPILE:%-=%))
> endif # CROSS_COMPILE
>
> ifeq ($(LLVM_IAS),0)
> -CLANG_FLAGS += -no-integrated-as
> +CLANG_FLAGS += -fno-integrated-as
> GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
> CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
> else
> -CLANG_FLAGS += -integrated-as
> +CLANG_FLAGS += -fintegrated-as
> endif
> CLANG_FLAGS += -Werror=unknown-warning-option
> KBUILD_CFLAGS += $(CLANG_FLAGS)
> diff --git a/scripts/as-version.sh b/scripts/as-version.sh
> index 8b9410e329df..a0fc366728f1 100755
> --- a/scripts/as-version.sh
> +++ b/scripts/as-version.sh
> @@ -21,13 +21,13 @@ get_canonical_version()
> echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0}))
> }
>
> -# Clang fails to handle -Wa,--version unless -no-integrated-as is given.
> -# We check -(f)integrated-as, expecting it is explicitly passed in for the
> +# Clang fails to handle -Wa,--version unless -fno-integrated-as is given.
> +# We check -fintegrated-as, expecting it is explicitly passed in for the
> # integrated assembler case.
> check_integrated_as()
> {
> while [ $# -gt 0 ]; do
> - if [ "$1" = -integrated-as -o "$1" = -fintegrated-as ]; then
> + if [ "$1" = -fintegrated-as ]; then
> # For the intergrated assembler, we do not check the
^ want to fix this typo, too? s/intergrated/integrated/
> # version here. It is the same as the clang version, and
> # it has been already checked by scripts/cc-version.sh.
>
> base-commit: f12b034afeb3a977bbb1c6584dedc0f3dc666f14
> --
> 2.33.0.rc2
>
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] kbuild: Switch to 'f' variants of integrated assembler flag
2021-08-16 20:48 ` Nick Desaulniers
@ 2021-08-16 20:50 ` Nathan Chancellor
0 siblings, 0 replies; 5+ messages in thread
From: Nathan Chancellor @ 2021-08-16 20:50 UTC (permalink / raw)
To: Nick Desaulniers
Cc: Masahiro Yamada, linux-kbuild, linux-kernel, clang-built-linux
On 8/16/2021 1:48 PM, 'Nick Desaulniers' via Clang Built Linux wrote:
> On Mon, Aug 16, 2021 at 1:37 PM Nathan Chancellor <nathan@kernel.org> wrote:
>>
>> It has been brought up a few times in various code reviews that clang
>> 3.5 introduced -f{,no-}integrated-as as the preferred way to enable and
>> disable the integrated assembler, mentioning that -{no-,}integrated-as
>> are now considered legacy flags.
>>
>> Switch the kernel over to using those variants in case there is ever a
>> time where clang decides to remove the non-'f' variants of the flag.
>>
>> Link: https://releases.llvm.org/3.5.0/tools/clang/docs/ReleaseNotes.html#new-compiler-flags
>> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
>
> Thanks for the patch! Want to fix
> tools/testing/selftests/rseq/Makefile and
> tools/testing/selftests/sched/Makefile, too? Either way...
> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Yes, I was planning to in a separate patch due to different maintainers :)
>> ---
>> scripts/Makefile.clang | 4 ++--
>> scripts/as-version.sh | 6 +++---
>> 2 files changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/scripts/Makefile.clang b/scripts/Makefile.clang
>> index 3ae63bd35582..4cce8fd0779c 100644
>> --- a/scripts/Makefile.clang
>> +++ b/scripts/Makefile.clang
>> @@ -23,11 +23,11 @@ CLANG_FLAGS += --target=$(notdir $(CROSS_COMPILE:%-=%))
>> endif # CROSS_COMPILE
>>
>> ifeq ($(LLVM_IAS),0)
>> -CLANG_FLAGS += -no-integrated-as
>> +CLANG_FLAGS += -fno-integrated-as
>> GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
>> CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
>> else
>> -CLANG_FLAGS += -integrated-as
>> +CLANG_FLAGS += -fintegrated-as
>> endif
>> CLANG_FLAGS += -Werror=unknown-warning-option
>> KBUILD_CFLAGS += $(CLANG_FLAGS)
>> diff --git a/scripts/as-version.sh b/scripts/as-version.sh
>> index 8b9410e329df..a0fc366728f1 100755
>> --- a/scripts/as-version.sh
>> +++ b/scripts/as-version.sh
>> @@ -21,13 +21,13 @@ get_canonical_version()
>> echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0}))
>> }
>>
>> -# Clang fails to handle -Wa,--version unless -no-integrated-as is given.
>> -# We check -(f)integrated-as, expecting it is explicitly passed in for the
>> +# Clang fails to handle -Wa,--version unless -fno-integrated-as is given.
>> +# We check -fintegrated-as, expecting it is explicitly passed in for the
>> # integrated assembler case.
>> check_integrated_as()
>> {
>> while [ $# -gt 0 ]; do
>> - if [ "$1" = -integrated-as -o "$1" = -fintegrated-as ]; then
>> + if [ "$1" = -fintegrated-as ]; then
>> # For the intergrated assembler, we do not check the
>
> ^ want to fix this typo, too? s/intergrated/integrated/
Sounds good, v2 inc.
>> # version here. It is the same as the clang version, and
>> # it has been already checked by scripts/cc-version.sh.
>>
>> base-commit: f12b034afeb3a977bbb1c6584dedc0f3dc666f14
>> --
>> 2.33.0.rc2
>>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] kbuild: Switch to 'f' variants of integrated assembler flag
2021-08-16 20:36 [PATCH] kbuild: Switch to 'f' variants of integrated assembler flag Nathan Chancellor
2021-08-16 20:48 ` Nick Desaulniers
@ 2021-08-16 20:52 ` Nathan Chancellor
2021-08-17 1:52 ` Masahiro Yamada
1 sibling, 1 reply; 5+ messages in thread
From: Nathan Chancellor @ 2021-08-16 20:52 UTC (permalink / raw)
To: Masahiro Yamada, Nick Desaulniers
Cc: linux-kbuild, linux-kernel, clang-built-linux, Nathan Chancellor
It has been brought up a few times in various code reviews that clang
3.5 introduced -f{,no-}integrated-as as the preferred way to enable and
disable the integrated assembler, mentioning that -{no-,}integrated-as
are now considered legacy flags.
Switch the kernel over to using those variants in case there is ever a
time where clang decides to remove the non-'f' variants of the flag.
Also, fix a typo in a comment ("intergrated" -> "integrated").
Link: https://releases.llvm.org/3.5.0/tools/clang/docs/ReleaseNotes.html#new-compiler-flags
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
---
v1 -> v2:
* Fix typo in comment in same area as patch.
* Add Nick's reviewed-by tag.
scripts/Makefile.clang | 4 ++--
scripts/as-version.sh | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/Makefile.clang b/scripts/Makefile.clang
index 3ae63bd35582..4cce8fd0779c 100644
--- a/scripts/Makefile.clang
+++ b/scripts/Makefile.clang
@@ -23,11 +23,11 @@ CLANG_FLAGS += --target=$(notdir $(CROSS_COMPILE:%-=%))
endif # CROSS_COMPILE
ifeq ($(LLVM_IAS),0)
-CLANG_FLAGS += -no-integrated-as
+CLANG_FLAGS += -fno-integrated-as
GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
else
-CLANG_FLAGS += -integrated-as
+CLANG_FLAGS += -fintegrated-as
endif
CLANG_FLAGS += -Werror=unknown-warning-option
KBUILD_CFLAGS += $(CLANG_FLAGS)
diff --git a/scripts/as-version.sh b/scripts/as-version.sh
index 8b9410e329df..1a21495e9ff0 100755
--- a/scripts/as-version.sh
+++ b/scripts/as-version.sh
@@ -21,14 +21,14 @@ get_canonical_version()
echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0}))
}
-# Clang fails to handle -Wa,--version unless -no-integrated-as is given.
-# We check -(f)integrated-as, expecting it is explicitly passed in for the
+# Clang fails to handle -Wa,--version unless -fno-integrated-as is given.
+# We check -fintegrated-as, expecting it is explicitly passed in for the
# integrated assembler case.
check_integrated_as()
{
while [ $# -gt 0 ]; do
- if [ "$1" = -integrated-as -o "$1" = -fintegrated-as ]; then
- # For the intergrated assembler, we do not check the
+ if [ "$1" = -fintegrated-as ]; then
+ # For the integrated assembler, we do not check the
# version here. It is the same as the clang version, and
# it has been already checked by scripts/cc-version.sh.
echo LLVM 0
base-commit: f12b034afeb3a977bbb1c6584dedc0f3dc666f14
--
2.33.0.rc2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] kbuild: Switch to 'f' variants of integrated assembler flag
2021-08-16 20:52 ` [PATCH v2] " Nathan Chancellor
@ 2021-08-17 1:52 ` Masahiro Yamada
0 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2021-08-17 1:52 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Nick Desaulniers, Linux Kbuild mailing list,
Linux Kernel Mailing List, clang-built-linux
On Tue, Aug 17, 2021 at 5:53 AM Nathan Chancellor <nathan@kernel.org> wrote:
>
> It has been brought up a few times in various code reviews that clang
> 3.5 introduced -f{,no-}integrated-as as the preferred way to enable and
> disable the integrated assembler, mentioning that -{no-,}integrated-as
> are now considered legacy flags.
>
> Switch the kernel over to using those variants in case there is ever a
> time where clang decides to remove the non-'f' variants of the flag.
>
> Also, fix a typo in a comment ("intergrated" -> "integrated").
>
> Link: https://releases.llvm.org/3.5.0/tools/clang/docs/ReleaseNotes.html#new-compiler-flags
> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> ---
Applied to linux-kbuild.
Thanks.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-17 1:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-16 20:36 [PATCH] kbuild: Switch to 'f' variants of integrated assembler flag Nathan Chancellor
2021-08-16 20:48 ` Nick Desaulniers
2021-08-16 20:50 ` Nathan Chancellor
2021-08-16 20:52 ` [PATCH v2] " Nathan Chancellor
2021-08-17 1:52 ` Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).