2021-06-21 23:19:51

by Nick Desaulniers

Subject: [PATCH v2 2/3] compiler_attributes.h: cleanups for GCC 4.9+

Since
commit 6ec4476ac825 ("Raise gcc version requirement to 4.9")
we no longer support building the kernel with GCC 4.8; drop the
preprocess checks for __GNUC_MINOR__ version. It's implied that if
__GNUC_MAJOR__ is 4, then the only supported version of __GNUC_MINOR__
left is 9.

Cc: Miguel Ojeda <[email protected]>
Signed-off-by: Nick Desaulniers <[email protected]>
---
include/linux/compiler_attributes.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/compiler_attributes.h b/include/linux/compiler_attributes.h
index 225511b17223..84b1c970acb3 100644
--- a/include/linux/compiler_attributes.h
+++ b/include/linux/compiler_attributes.h
@@ -27,7 +27,7 @@
*/
#ifndef __has_attribute
# define __has_attribute(x) __GCC4_has_attribute_##x
-# define __GCC4_has_attribute___assume_aligned__ (__GNUC_MINOR__ >= 9)
+# define __GCC4_has_attribute___assume_aligned__ 1
# define __GCC4_has_attribute___copy__ 0
# define __GCC4_has_attribute___designated_init__ 0
# define __GCC4_has_attribute___externally_visible__ 1
@@ -35,8 +35,8 @@
# define __GCC4_has_attribute___noclone__ 1
# define __GCC4_has_attribute___no_profile_instrument_function__ 0
# define __GCC4_has_attribute___nonstring__ 0
-# define __GCC4_has_attribute___no_sanitize_address__ (__GNUC_MINOR__ >= 8)
-# define __GCC4_has_attribute___no_sanitize_undefined__ (__GNUC_MINOR__ >= 9)
+# define __GCC4_has_attribute___no_sanitize_address__ 1
+# define __GCC4_has_attribute___no_sanitize_undefined__ 1
# define __GCC4_has_attribute___fallthrough__ 0
#endif

--
2.32.0.288.g62a8d224e6-goog

2021-06-21 23:33:05

by Miguel Ojeda

Subject: Re: [PATCH v2 2/3] compiler_attributes.h: cleanups for GCC 4.9+

On Tue, Jun 22, 2021 at 1:18 AM Nick Desaulniers
<[email protected]> wrote:
>
> Since
> commit 6ec4476ac825 ("Raise gcc version requirement to 4.9")
> we no longer support building the kernel with GCC 4.8; drop the
> preprocess checks for __GNUC_MINOR__ version. It's implied that if
> __GNUC_MAJOR__ is 4, then the only supported version of __GNUC_MINOR__
> left is 9.

Yeah, I was waiting for the raise to 5.x to remove the entire block,
but this is of course good since we did not get that yet :-)

Reviewed-by: Miguel Ojeda <[email protected]>

Cheers,
Miguel

2021-06-21 23:45:41

by Nathan Chancellor

Subject: Re: [PATCH v2 2/3] compiler_attributes.h: cleanups for GCC 4.9+

On 6/21/2021 4:18 PM, 'Nick Desaulniers' via Clang Built Linux wrote:
> Since
> commit 6ec4476ac825 ("Raise gcc version requirement to 4.9")
> we no longer support building the kernel with GCC 4.8; drop the
> preprocess checks for __GNUC_MINOR__ version. It's implied that if
> __GNUC_MAJOR__ is 4, then the only supported version of __GNUC_MINOR__
> left is 9.
>
> Cc: Miguel Ojeda <[email protected]>
> Signed-off-by: Nick Desaulniers <[email protected]>

Reviewed-by: Nathan Chancellor <[email protected]>

> ---
> include/linux/compiler_attributes.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/compiler_attributes.h b/include/linux/compiler_attributes.h
> index 225511b17223..84b1c970acb3 100644
> --- a/include/linux/compiler_attributes.h
> +++ b/include/linux/compiler_attributes.h
> @@ -27,7 +27,7 @@
> */
> #ifndef __has_attribute
> # define __has_attribute(x) __GCC4_has_attribute_##x
> -# define __GCC4_has_attribute___assume_aligned__ (__GNUC_MINOR__ >= 9)
> +# define __GCC4_has_attribute___assume_aligned__ 1
> # define __GCC4_has_attribute___copy__ 0
> # define __GCC4_has_attribute___designated_init__ 0
> # define __GCC4_has_attribute___externally_visible__ 1
> @@ -35,8 +35,8 @@
> # define __GCC4_has_attribute___noclone__ 1
> # define __GCC4_has_attribute___no_profile_instrument_function__ 0
> # define __GCC4_has_attribute___nonstring__ 0
> -# define __GCC4_has_attribute___no_sanitize_address__ (__GNUC_MINOR__ >= 8)
> -# define __GCC4_has_attribute___no_sanitize_undefined__ (__GNUC_MINOR__ >= 9)
> +# define __GCC4_has_attribute___no_sanitize_address__ 1
> +# define __GCC4_has_attribute___no_sanitize_undefined__ 1
> # define __GCC4_has_attribute___fallthrough__ 0
> #endif
>
>