motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-18 23:52:14 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: move TARGET_GPROF to config-host.mak

Browse source 
TARGET_GPROF is the same for all targets, write it to
config-host.mak instead.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: <20200204161104.21077-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-02-04 17:11:04 +01:00
parent fe3dada317
commit 4cc600d229
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bsd-user/syscall.c
View file

@ -330,7 +330,7 @@ abi_long do_freebsd_syscall(void *cpu_env, int num, abi_long arg1,
switch(num) { switch(num) {
case TARGET_FREEBSD_NR_exit: case TARGET_FREEBSD_NR_exit:
#ifdef TARGET_GPROF #ifdef CONFIG_GPROF
_mcleanup(); _mcleanup();
#endif #endif
gdb_exit(cpu_env, arg1); gdb_exit(cpu_env, arg1);
@ -432,7 +432,7 @@ abi_long do_netbsd_syscall(void *cpu_env, int num, abi_long arg1,
switch(num) { switch(num) {
case TARGET_NETBSD_NR_exit: case TARGET_NETBSD_NR_exit:
#ifdef TARGET_GPROF #ifdef CONFIG_GPROF
_mcleanup(); _mcleanup();
#endif #endif
gdb_exit(cpu_env, arg1); gdb_exit(cpu_env, arg1);
@ -511,7 +511,7 @@ abi_long do_openbsd_syscall(void *cpu_env, int num, abi_long arg1,
switch(num) { switch(num) {
case TARGET_OPENBSD_NR_exit: case TARGET_OPENBSD_NR_exit:
#ifdef TARGET_GPROF #ifdef CONFIG_GPROF
_mcleanup(); _mcleanup();
#endif #endif
gdb_exit(cpu_env, arg1); gdb_exit(cpu_env, arg1);

4
configure vendored
View file

@ -6771,6 +6771,9 @@ fi
if test "$l2tpv3" = "yes" ; then if test "$l2tpv3" = "yes" ; then
echo "CONFIG_L2TPV3=y" >> $config_host_mak echo "CONFIG_L2TPV3=y" >> $config_host_mak
fi fi
if test "$gprof" = "yes" ; then
echo "CONFIG_GPROF=y" >> $config_host_mak
fi
if test "$cap_ng" = "yes" ; then if test "$cap_ng" = "yes" ; then
echo "CONFIG_LIBCAP_NG=y" >> $config_host_mak echo "CONFIG_LIBCAP_NG=y" >> $config_host_mak
fi fi
@ -7951,7 +7954,6 @@ alpha)
esac esac
if test "$gprof" = "yes" ; then if test "$gprof" = "yes" ; then
echo "TARGET_GPROF=y" >> $config_target_mak
if test "$target_linux_user" = "yes" ; then if test "$target_linux_user" = "yes" ; then
cflags="-p $cflags" cflags="-p $cflags"
ldflags="-p $ldflags" ldflags="-p $ldflags"

4
linux-user/exit.c
View file

@ -18,7 +18,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu.h" #include "qemu.h"
#ifdef TARGET_GPROF #ifdef CONFIG_GPROF
#include <sys/gmon.h> #include <sys/gmon.h>
#endif #endif
@ -28,7 +28,7 @@ extern void __gcov_dump(void);
void preexit_cleanup(CPUArchState *env, int code) void preexit_cleanup(CPUArchState *env, int code)
{ {
#ifdef TARGET_GPROF #ifdef CONFIG_GPROF
_mcleanup(); _mcleanup();
#endif #endif
#ifdef CONFIG_GCOV #ifdef CONFIG_GCOV

2
linux-user/signal.c
View file

@ -509,7 +509,7 @@ void signal_init(void)
act.sa_flags = SA_SIGINFO; act.sa_flags = SA_SIGINFO;
act.sa_sigaction = host_signal_handler; act.sa_sigaction = host_signal_handler;
for(i = 1; i <= TARGET_NSIG; i++) { for(i = 1; i <= TARGET_NSIG; i++) {
#ifdef TARGET_GPROF #ifdef CONFIG_GPROF
if (i == SIGPROF) { if (i == SIGPROF) {
continue; continue;
} }

2
tests/check-block.sh
View file

@ -16,7 +16,7 @@ if [ "$#" -ne 0 ]; then
format_list="$@" format_list="$@"
fi fi
if grep -q "TARGET_GPROF=y" *-softmmu/config-target.mak 2>/dev/null ; then if grep -q "CONFIG_GPROF=y" config-host.mak 2>/dev/null ; then
echo "GPROF is enabled ==> Not running the qemu-iotests." echo "GPROF is enabled ==> Not running the qemu-iotests."
exit 0 exit 0
fi fi