Refactor HELPER_CFLAGS
Calculate its value in ./configure.
Put together all its uses
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
diff --git a/Makefile.target b/Makefile.target
index 53a38a3..d34156c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -19,22 +19,10 @@
PROGS=$(QEMU_PROG)
-HELPER_CFLAGS=
-
-ifeq ($(ARCH),i386)
-HELPER_CFLAGS+=-fomit-frame-pointer
-endif
-
ifeq ($(subst ppc64,ppc,$(ARCH))$(TARGET_BASE_ARCH),ppcppc)
translate.o: QEMU_CFLAGS := $(QEMU_CFLAGS) $(call cc-option, $(QEMU_CFLAGS), -fno-unit-at-a-time,)
endif
-ifeq ($(ARCH),sparc)
- ifneq ($(CONFIG_SOLARIS),y)
- HELPER_CFLAGS+=-ffixed-i0
- endif
-endif
-
ifeq ($(ARCH),alpha)
# Ensure there's only a single GP
QEMU_CFLAGS+=-msmall-data
@@ -153,6 +141,10 @@
cpu-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
+# Note: this is a workaround. The real fix is to avoid compiling
+# cpu_signal_handler() in cpu-exec.c.
+signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
+
#########################################################
# Linux user emulator target
@@ -188,10 +180,6 @@
obj-m68k-y += m68k-sim.o m68k-semi.o
-# Note: this is a workaround. The real fix is to avoid compiling
-# cpu_signal_handler() in cpu-exec.c.
-signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
-
ARLIBS=../libqemu_user.a libqemu.a
endif #CONFIG_LINUX_USER
@@ -211,10 +199,6 @@
obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \
gdbstub.o gdbstub-xml.o ioport-user.o
-# Note: this is a workaround. The real fix is to avoid compiling
-# cpu_signal_handler() in cpu-exec.c.
-signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
-
ARLIBS=libqemu.a
endif #CONFIG_DARWIN_USER
@@ -231,10 +215,6 @@
gdbstub.o gdbstub-xml.o ioport-user.o
obj-y += uaccess.o
-# Note: this is a workaround. The real fix is to avoid compiling
-# cpu_signal_handler() in cpu-exec.c.
-signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
-
ARLIBS=libqemu.a ../libqemu_user.a
endif #CONFIG_BSD_USER
diff --git a/configure b/configure
index 59fc842..3229e6c 100755
--- a/configure
+++ b/configure
@@ -44,6 +44,7 @@
install="install"
objcopy="objcopy"
ld="ld"
+helper_cflags=""
# parse CC options first
for opt do
@@ -533,6 +534,7 @@
QEMU_CFLAGS="-m32 -ffixed-g2 -ffixed-g3 $QEMU_CFLAGS"
if test "$solaris" = "no" ; then
QEMU_CFLAGS="-ffixed-g1 -ffixed-g6 $QEMU_CFLAGS"
+ helper_cflags="-ffixed-i0"
fi
;;
sparc64)
@@ -549,6 +551,7 @@
i386)
QEMU_CFLAGS="-m32 $QEMU_CFLAGS"
LDFLAGS="-m32 $LDFLAGS"
+ helper_cflags="-fomit-frame-pointer"
host_guest_base="yes"
;;
x86_64)
@@ -1753,6 +1756,7 @@
echo "LD=$ld" >> $config_host_mak
echo "CFLAGS=$CFLAGS" >> $config_host_mak
echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
+echo "HELPER_CFLAGS=$helper_cflags" >> $config_host_mak
echo "LDFLAGS=$LDFLAGS" >> $config_host_mak
echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak
echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
