From: Nick Desaulniers <ndesaulniers@google.com>
To: akpm@linux-foundation.org
Cc: miguel.ojeda.sandonis@gmail.com,
Nick Desaulniers <ndesaulniers@google.com>,
Kees Cook <keescook@chromium.org>, Ingo Molnar <mingo@kernel.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Arnd Bergmann <arnd@arndb.de>, Joe Perches <joe@perches.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Paul Burton <paul.burton@mips.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Will Deacon <will.deacon@arm.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] include/linux/compiler*.h: add version detection to asm_volatile_goto
Date: Fri, 7 Sep 2018 15:21:03 -0700 [thread overview]
Message-ID: <20180907222109.163802-1-ndesaulniers@google.com> (raw)
The comment above asm_volatile_goto mentions working around a GCC bug,
and links to a bug report that claims this has been fixed in newer
versions of GCC. Testing shows that this was resolved in GCC 4.8.2.
asm_volatile_goto should also be defined for other compilers that
support asm goto.
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
include/linux/compiler-gcc.h | 7 ++++++-
include/linux/compiler_types.h | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 763bbad1e258..149f411b4366 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -171,7 +171,7 @@
#endif
/*
- * GCC 'asm goto' miscompiles certain code sequences:
+ * GCC < 4.8.2 'asm goto' miscompiles certain code sequences:
*
* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
*
@@ -179,7 +179,12 @@
*
* (asm goto is automatically volatile - the naming reflects this.)
*/
+#if GCC_VERSION < 40802
#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
+#else
+#define asm_volatile_goto(x...) asm goto(x)
+#endif
+
/*
* sparse (__CHECKER__) pretends to be gcc, but can't do constant
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 3525c179698c..61449dbf30d8 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -151,6 +151,10 @@ struct ftrace_likely_data {
#define __assume_aligned(a, ...)
#endif
+#ifndef asm_volatile_goto
+#define asm_volatile_goto(x...) asm goto(x)
+#endif
+
/* Are two types/vars the same type (ignoring qualifiers)? */
#define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
--
2.19.0.rc2.392.g5ba43deb5a-goog
next reply other threads:[~2018-09-07 22:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-07 22:21 Nick Desaulniers [this message]
2018-09-09 15:16 ` [PATCH] include/linux/compiler*.h: add version detection to asm_volatile_goto Miguel Ojeda
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=20180907222109.163802-1-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=geert@linux-m68k.org \
--cc=herbert@gondor.apana.org.au \
--cc=joe@perches.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=mingo@kernel.org \
--cc=paul.burton@mips.com \
--cc=will.deacon@arm.com \
--cc=yamada.masahiro@socionext.com \
/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).