From: Paul Brook <paul@nowt.org>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [4607] Don't link usermode emulation against libqemu_common.a
Date: Wed, 28 May 2008 16:44:58 +0000 [thread overview]
Message-ID: <E1K1Olm-0000tr-HT@cvs.savannah.gnu.org> (raw)
Revision: 4607
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4607
Author: pbrook
Date: 2008-05-28 16:44:57 +0000 (Wed, 28 May 2008)
Log Message:
-----------
Don't link usermode emulation against libqemu_common.a
Modified Paths:
--------------
trunk/Makefile
trunk/Makefile.target
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2008-05-28 16:25:20 UTC (rev 4606)
+++ trunk/Makefile 2008-05-28 16:44:57 UTC (rev 4607)
@@ -26,11 +26,16 @@
all: $(TOOLS) $(DOCS) recurse-all
-subdir-%: dyngen$(EXESUF) libqemu_common.a
+SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
+
+subdir-%: dyngen$(EXESUF)
$(MAKE) -C $(subst subdir-,,$@) all
-recurse-all: $(patsubst %,subdir-%, $(TARGET_DIRS))
+$(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
+$(filter %-user,$(SUBDIR_RULES)): libqemu_user.a
+recurse-all: $(SUBDIR_RULES)
+
#######################################################################
# BLOCK_OBJS is code used by both qemu system emulation and qemu-img
@@ -141,6 +146,14 @@
rm -f $@
$(AR) rcs $@ $(OBJS)
+#######################################################################
+# USER_OBJS is code used by qemu userspace emulation
+USER_OBJS=cutils.o
+
+libqemu_user.a: $(USER_OBJS)
+ rm -f $@
+ $(AR) rcs $@ $(USER_OBJS)
+
QEMU_IMG_BLOCK_OBJS = $(BLOCK_OBJS)
ifdef CONFIG_WIN32
QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-win32.o
Modified: trunk/Makefile.target
===================================================================
--- trunk/Makefile.target 2008-05-28 16:25:20 UTC (rev 4606)
+++ trunk/Makefile.target 2008-05-28 16:44:57 UTC (rev 4607)
@@ -414,14 +414,13 @@
endif
OBJS+= libqemu.a
-OBJS+= ../libqemu_common.a
# Note: this is a workaround. The real fix is to avoid compiling
# cpu_signal_handler() in cpu-exec.c.
signal.o: signal.c
$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-$(QEMU_PROG): $(OBJS)
+$(QEMU_PROG): $(OBJS) ../libqemu_user.a
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
ifeq ($(ARCH),alpha)
# Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of
reply other threads:[~2008-05-28 16:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=E1K1Olm-0000tr-HT@cvs.savannah.gnu.org \
--to=paul@nowt.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.