From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Jan Beulich <jbeulich@suse.com>,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH v5 4/5] x86: fix indirect thunk usage of CONFIG_INDIRECT_THUNK
Date: Tue, 20 Feb 2018 14:10:14 +0000 [thread overview]
Message-ID: <20180220141015.30714-5-roger.pau@citrix.com> (raw)
In-Reply-To: <20180220141015.30714-1-roger.pau@citrix.com>
When indirect_thunk_asm.h is instantiated directly into assembly files
CONFIG_INDIRECT_THUNK might not be defined, and thus using .if against
it is wrong.
Add a check to define CONFIG_INDIRECT_THUNK to 0 if not defined, so
that using .if CONFIG_INDIRECT_THUNK is always correct.
This suppresses the following clang error:
<instantiation>:8:9: error: expected absolute expression
.if CONFIG_INDIRECT_THUNK == 1
^
<instantiation>:1:1: note: while in macro instantiation
INDIRECT_BRANCH call %rdx
^
entry.S:589:9: note: while in macro instantiation
INDIRECT_CALL %rdx
^
Note that this is a preparatory patch in order to enable clang's
integrated assembler, the integrated assembler is not yet enabled for
assembly files.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
---
Changes since v4:
- Define CONFIG_INDIRECT_THUNK if not defined using an equation.
---
xen/include/asm-x86/asm_defns.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h
index 6fc13d39d8..ebd2c88a1f 100644
--- a/xen/include/asm-x86/asm_defns.h
+++ b/xen/include/asm-x86/asm_defns.h
@@ -15,6 +15,9 @@
#include <asm/alternative.h>
#ifdef __ASSEMBLY__
+#ifndef CONFIG_INDIRECT_THUNK
+.equ CONFIG_INDIRECT_THUNK, 0
+#endif
# include <asm/indirect_thunk_asm.h>
#else
asm ( "\t.equ CONFIG_INDIRECT_THUNK, "
--
2.16.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2018-02-20 14:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-20 14:10 [PATCH v5 0/5] clang improvements Roger Pau Monne
2018-02-20 14:10 ` [PATCH v5 1/5] build: do not hardcode AFLAGS for as-insn tests Roger Pau Monne
2018-02-21 16:12 ` Andrew Cooper
2018-02-20 14:10 ` [PATCH v5 2/5] build: filter out command line assembler arguments Roger Pau Monne
2018-02-21 16:26 ` Andrew Cooper
2018-02-20 14:10 ` [PATCH v5 3/5] x86/clang: restore integrated assembler usage with indirect thunks Roger Pau Monne
2018-02-21 16:56 ` Andrew Cooper
2018-02-22 9:12 ` Roger Pau Monné
2018-02-20 14:10 ` Roger Pau Monne [this message]
2018-02-22 14:42 ` [PATCH v5 4/5] x86: fix indirect thunk usage of CONFIG_INDIRECT_THUNK Jan Beulich
2018-02-20 14:10 ` [PATCH v5 5/5] build/clang: add a check whether the assembler supports .skip with labels Roger Pau Monne
2018-02-22 14:43 ` Jan Beulich
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=20180220141015.30714-5-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=jbeulich@suse.com \
--cc=xen-devel@lists.xenproject.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).