2021-08-16 20:38:26

by Nathan Chancellor

Subject: [PATCH] kbuild: Switch to 'f' variants of integrated assembler flag

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 <[email protected]>
---
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

2021-08-16 20:51:24

by Nick Desaulniers

Subject: Re: [PATCH] kbuild: Switch to 'f' variants of integrated assembler flag

On Mon, Aug 16, 2021 at 1:37 PM Nathan Chancellor <[email protected]> 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 <[email protected]>

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 <[email protected]>

> ---
> 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

2021-08-16 20:51:57

by Nathan Chancellor

Subject: Re: [PATCH] kbuild: Switch to 'f' variants of integrated assembler flag

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 <[email protected]> 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 <[email protected]>
>
> 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 <[email protected]>

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
>>
>
>

2021-08-16 20:56:31

by Nathan Chancellor

Subject: [PATCH v2] kbuild: Switch to 'f' variants of integrated assembler flag

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 <[email protected]>
Signed-off-by: Nathan Chancellor <[email protected]>
---

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

2021-08-17 01:55:45

by Masahiro Yamada

Subject: Re: [PATCH v2] kbuild: Switch to 'f' variants of integrated assembler flag

On Tue, Aug 17, 2021 at 5:53 AM Nathan Chancellor <[email protected]> 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 <[email protected]>
> Signed-off-by: Nathan Chancellor <[email protected]>
> ---


Applied to linux-kbuild.
Thanks.



--
Best Regards
Masahiro Yamada