From: Yonggang Luo <luoyonggang@gmail.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Yonggang Luo <luoyonggang@gmail.com>
Subject: [PATCH 4/6] tcg: Fixes dup_const link error
Date: Thu, 3 Sep 2020 01:00:52 +0800 [thread overview]
Message-ID: <20200902170054.810-5-luoyonggang@gmail.com> (raw)
In-Reply-To: <20200902170054.810-1-luoyonggang@gmail.com>
Rename function dup_const to dup_const_eval for avoid confliction with macro dup_const
The link error on msys2
Linking target qemu-system-alpha.exe
C:/CI-Tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: libqemu-alpha-softmmu.fa.p/tcg_optimize.c.obj: in function `tcg_optimize':
E:\CI-Cor-Ready\xemu\qemu-build/../qemu.org/tcg/optimize.c:1106: undefined reference to `dup_const'
C:/CI-Tools/msys64/mingw64/bin/../lib/gcc/x86_64-w64-mingw32/10.2.0/../../../../x86_64-w64-mingw32/bin/ld.exe: libqemu-alpha-softmmu.fa.p/tcg_tcg-op-vec.c.obj: in function `tcg_gen_dupi_vec':
E:\CI-Cor-Ready\xemu\qemu-build/../qemu.org/tcg/tcg-op-vec.c:283: undefined reference to `dup_const'
collect2.exe: error: ld returned 1 exit status
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
include/tcg/tcg.h | 6 +++---
tcg/tcg-op-gvec.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index 53ce94c2c5..7f6fe8454b 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -1251,15 +1251,15 @@ static inline int tcg_can_emit_vec_op(TCGOpcode o, TCGType t, unsigned ve)
void tcg_expand_vec_op(TCGOpcode, TCGType, unsigned, TCGArg, ...);
/* Replicate a constant C accoring to the log2 of the element size. */
-uint64_t dup_const(unsigned vece, uint64_t c);
+uint64_t dup_const_eval(unsigned vece, uint64_t c);
#define dup_const(VECE, C) \
(__builtin_constant_p(VECE) \
? ( (VECE) == MO_8 ? 0x0101010101010101ull * (uint8_t)(C) \
: (VECE) == MO_16 ? 0x0001000100010001ull * (uint16_t)(C) \
: (VECE) == MO_32 ? 0x0000000100000001ull * (uint32_t)(C) \
- : dup_const(VECE, C)) \
- : dup_const(VECE, C))
+ : dup_const_eval(VECE, C)) \
+ : dup_const_eval(VECE, C))
/*
diff --git a/tcg/tcg-op-gvec.c b/tcg/tcg-op-gvec.c
index 3707c0effb..cbb6cd04bc 100644
--- a/tcg/tcg-op-gvec.c
+++ b/tcg/tcg-op-gvec.c
@@ -359,7 +359,7 @@ static inline bool check_size_impl(uint32_t oprsz, uint32_t lnsz)
static void expand_clr(uint32_t dofs, uint32_t maxsz);
/* Duplicate C as per VECE. */
-uint64_t (dup_const)(unsigned vece, uint64_t c)
+uint64_t dup_const_eval(unsigned vece, uint64_t c)
{
switch (vece) {
case MO_8:
--
2.27.0.windows.1
next prev parent reply other threads:[~2020-09-02 17:03 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 17:00 [PATCH 0/6] Green the msys2 CI make Yonggang Luo
2020-09-02 17:00 ` [PATCH 1/6] configure: fixes dtc not cloned when running msys2 CI Yonggang Luo
2020-09-02 17:32 ` Philippe Mathieu-Daudé
2020-09-02 17:00 ` [PATCH 2/6] meson: Convert undefsym.sh to undefsym.py Yonggang Luo
2020-09-02 17:00 ` [PATCH 3/6] ci: Install msys2 in a proper way refer to https://github.com/cirruslabs/cirrus-ci-docs/issues/699 Enable msys2 ci in cirrus Yonggang Luo
2020-09-02 17:30 ` Philippe Mathieu-Daudé
2020-09-02 17:42 ` 罗勇刚(Yonggang Luo)
2020-09-02 19:31 ` Philippe Mathieu-Daudé
2020-09-02 19:32 ` 罗勇刚(Yonggang Luo)
2020-09-02 17:50 ` 罗勇刚(Yonggang Luo)
2020-09-02 18:54 ` Mark Cave-Ayland
2020-09-02 18:56 ` 罗勇刚(Yonggang Luo)
2020-09-02 19:00 ` Mark Cave-Ayland
2020-09-02 19:01 ` 罗勇刚(Yonggang Luo)
2020-09-02 19:13 ` Mark Cave-Ayland
2020-09-02 19:15 ` 罗勇刚(Yonggang Luo)
2020-09-02 18:50 ` Mark Cave-Ayland
2020-09-02 17:00 ` Yonggang Luo [this message]
2020-09-02 17:16 ` [PATCH 4/6] tcg: Fixes dup_const link error Richard Henderson
2020-09-02 17:17 ` 罗勇刚(Yonggang Luo)
2020-09-02 17:21 ` Richard Henderson
2020-09-02 17:00 ` [PATCH 5/6] tests: handling signal on win32 properly Yonggang Luo
2020-09-02 17:04 ` Paolo Bonzini
2020-09-02 17:09 ` 罗勇刚(Yonggang Luo)
2020-09-03 5:58 ` Thomas Huth
2020-09-03 7:00 ` Paolo Bonzini
2020-09-02 17:00 ` [PATCH 6/6] configure: Fix include and linkage issue on msys2 Yonggang Luo
2020-09-02 17:05 ` Paolo Bonzini
2020-09-02 17:06 ` 罗勇刚(Yonggang Luo)
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=20200902170054.810-5-luoyonggang@gmail.com \
--to=luoyonggang@gmail.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.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).