aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-08-03 14:46:50 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-10 13:05:44 -0500
commitd02c1db3d8c29f5733a19b23088e19ea69b257e1 (patch)
tree5dc696b1714498bef853a3f8bd4e30bcc60474c0
parent10a072a2bdf4702ce80da10f4bdc526f79e92408 (diff)
Fold TARGET_GPROF handling in configure
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
-rw-r--r--Makefile.target7
-rwxr-xr-xconfigure14
2 files changed, 11 insertions, 10 deletions
diff --git a/Makefile.target b/Makefile.target
index 32fa27f3c4..45c9305643 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -138,12 +138,6 @@ ifdef CONFIG_LINUX_USER
VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
-# profiling code
-ifdef TARGET_GPROF
-LDFLAGS+=-p
-QEMU_CFLAGS+=-p
-endif
-
obj-y = main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \
elfload.o linuxload.o uaccess.o envlist.o gdbstub.o gdbstub-xml.o \
ioport-user.o
@@ -366,7 +360,6 @@ endif
# profiling code
ifdef TARGET_GPROF
-LDFLAGS+=-p
main.o vl.o: QEMU_CFLAGS+=-p
endif
diff --git a/configure b/configure
index 11b83db4f0..3dc9fffdaa 100755
--- a/configure
+++ b/configure
@@ -1595,9 +1595,6 @@ if test "$solaris" = "yes" ; then
echo "CONFIG_NEEDS_LIBSUNMATH=y" >> $config_host_mak
fi
fi
-if test "$gprof" = "yes" ; then
- echo "TARGET_GPROF=yes" >> $config_host_mak
-fi
if test "$static" = "yes" ; then
echo "CONFIG_STATIC=y" >> $config_host_mak
LDFLAGS="-static $LDFLAGS"
@@ -2083,6 +2080,17 @@ ia64)
;;
esac
+if test "$gprof" = "yes" ; then
+ echo "TARGET_GPROF=yes" >> $config_mak
+ if test "$target_linux_user" = "yes" ; then
+ cflags="-p $cflags"
+ ldflags="-p $ldflags"
+ fi
+ if test "$target_softmmu" = "yes" ; then
+ ldflags="-p $ldflags"
+ fi
+fi
+
linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/\$(ARCH).ld"
if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then
case "$ARCH" in