From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Laurent Desnogues" <laurent.desnogues@gmail.com>,
"Riku Voipio" <riku.voipio@iki.fi>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Laurent Vivier" <laurent@vivier.eu>
Subject: [Qemu-devel] [PULL v2 7/7] linux-user: fix GPROF build failure
Date: Fri, 10 May 2019 12:45:36 +0200 [thread overview]
Message-ID: <20190510104536.17483-8-laurent@vivier.eu> (raw)
In-Reply-To: <20190510104536.17483-1-laurent@vivier.eu>
From: Alex Bennée <alex.bennee@linaro.org>
When linux-user/exit was introduced we failed to move the gprof
include at the same time. The CI didn't notice because it only builds
system emulation. Fix it for those that still find gprof useful.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Message-Id: <20190502092728.32727-1-alex.bennee@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/exit.c | 3 +++
linux-user/syscall.c | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/linux-user/exit.c b/linux-user/exit.c
index 14e94e28faf8..bdda7205532e 100644
--- a/linux-user/exit.c
+++ b/linux-user/exit.c
@@ -18,6 +18,9 @@
*/
#include "qemu/osdep.h"
#include "qemu.h"
+#ifdef TARGET_GPROF
+#include <sys/gmon.h>
+#endif
#ifdef CONFIG_GCOV
extern void __gcov_dump(void);
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 44b593b81161..f5ff6f5dc8a8 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -59,9 +59,6 @@
#ifdef CONFIG_TIMERFD
#include <sys/timerfd.h>
#endif
-#ifdef TARGET_GPROF
-#include <sys/gmon.h>
-#endif
#ifdef CONFIG_EVENTFD
#include <sys/eventfd.h>
#endif
--
2.20.1
next prev parent reply other threads:[~2019-05-10 10:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-10 10:45 [Qemu-devel] [PULL v2 0/7] Linux user for 4.1 patches Laurent Vivier
2019-05-10 10:45 ` [Qemu-devel] [PULL v2 1/7] linux-user: Add missing IPV6 sockopts Laurent Vivier
2019-05-10 10:45 ` [Qemu-devel] [PULL v2 2/7] linux-user/elfload: Fix GCC 9 build warnings Laurent Vivier
2019-05-10 10:45 ` [Qemu-devel] [PULL v2 3/7] linux-user: avoid string truncation warnings in uname field copying Laurent Vivier
2019-05-10 10:45 ` [Qemu-devel] [PULL v2 4/7] The ioctl(SIOCGIFNAME) call requires a struct ifreq Laurent Vivier
2019-05-10 10:45 ` [Qemu-devel] [PULL v2 5/7] linux-user: elf: Map empty PT_LOAD segments Laurent Vivier
2019-05-10 10:45 ` [Qemu-devel] [PULL v2 6/7] linux-user: avoid treading on gprof's SIGPROF signals Laurent Vivier
2019-05-10 10:45 ` Laurent Vivier [this message]
2019-05-10 12:32 ` [Qemu-devel] [PULL v2 0/7] Linux user for 4.1 patches Peter Maydell
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=20190510104536.17483-8-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=alex.bennee@linaro.org \
--cc=laurent.desnogues@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=riku.voipio@iki.fi \
/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).