From: Nick Desaulniers <ndesaulniers@google.com>
To: Kees Cook <keescook@chromium.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Bill Wendling <wcw@google.com>,
Sami Tolvanen <samitolvanen@google.com>,
Peter Oberparleiter <oberpar@linux.ibm.com>,
Masahiro Yamada <masahiroy@kernel.org>,
Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>,
Nathan Chancellor <nathan@kernel.org>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
Ard Biesheuvel <ardb@kernel.org>, Will Deacon <will@kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
Andrew Morton <akpm@linux-foundation.org>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com,
x86@kernel.org, Borislav Petkov <bp@alien8.de>,
Martin Liska <mliska@suse.cz>, Marco Elver <elver@google.com>,
Jonathan Corbet <corbet@lwn.net>,
Fangrui Song <maskray@google.com>,
linux-doc@vger.kernel.org, linux-kbuild@vger.kernel.org,
Dmitry Vyukov <dvyukov@google.com>,
johannes.berg@intel.com, linux-toolchains@vger.kernel.org,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
linux-s390@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
Catalin Marinas <catalin.marinas@arm.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Miguel Ojeda <ojeda@kernel.org>
Subject: [PATCH v2 2/3] compiler_attributes.h: cleanups for GCC 4.9+
Date: Mon, 21 Jun 2021 16:18:21 -0700 [thread overview]
Message-ID: <20210621231822.2848305-3-ndesaulniers@google.com> (raw)
In-Reply-To: <20210621231822.2848305-1-ndesaulniers@google.com>
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 <ojeda@kernel.org>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
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
next prev parent reply other threads:[~2021-06-21 23:19 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 23:18 [PATCH v2 0/3] no_profile fn attr and Kconfig for GCOV+PGO Nick Desaulniers
2021-06-21 23:18 ` [PATCH v2 1/3] compiler_attributes.h: define __no_profile, add to noinstr Nick Desaulniers
2021-06-21 23:41 ` Nathan Chancellor
2021-06-21 23:18 ` Nick Desaulniers [this message]
2021-06-21 23:31 ` [PATCH v2 2/3] compiler_attributes.h: cleanups for GCC 4.9+ Miguel Ojeda
2021-06-21 23:42 ` Nathan Chancellor
2021-06-21 23:18 ` [PATCH v2 3/3] Kconfig: add ARCH_WANTS_NO_INSTR+CC_HAS_NO_PROFILE_FN_ATTR, depend on for GCOV and PGO Nick Desaulniers
2021-06-21 23:45 ` Nathan Chancellor
2021-06-22 7:25 ` Peter Zijlstra
2021-06-22 8:09 ` Marco Elver
2021-06-22 9:05 ` Mark Rutland
2021-06-22 11:10 ` Will Deacon
2021-06-22 9:33 ` Heiko Carstens
2021-06-22 9:35 ` Peter Oberparleiter
2021-06-22 7:25 ` [PATCH v2 0/3] no_profile fn attr and Kconfig for GCOV+PGO Peter Zijlstra
2021-06-22 18:19 ` Kees Cook
2021-06-23 6:15 ` Kees Cook
2021-06-24 19:36 ` Nick Desaulniers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210621231822.2848305-3-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=akpm@linux-foundation.org \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=borntraeger@de.ibm.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=clang-built-linux@googlegroups.com \
--cc=corbet@lwn.net \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=johannes.berg@intel.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-toolchains@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=luc.vanoostenryck@gmail.com \
--cc=masahiroy@kernel.org \
--cc=maskray@google.com \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=mliska@suse.cz \
--cc=nathan@kernel.org \
--cc=oberpar@linux.ibm.com \
--cc=ojeda@kernel.org \
--cc=peterz@infradead.org \
--cc=samitolvanen@google.com \
--cc=wcw@google.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).