Patchwork [5/6] Makefile.objs: Remove libqemu_common.a target

login
register
mail settings
Submitter 陳韋任
Date Nov. 8, 2011, 1:09 p.m.
Message ID <1320757785-20894-1-git-send-email-chenwj@iis.sinica.edu.tw>
Download mbox | patch
Permalink /patch/124357/
State New
Headers show

Comments

陳韋任 - Nov. 8, 2011, 1:09 p.m.
From: Chen Wen-Ren <chenwj@iis.sinica.edu.tw>

  Remove libqemu_common.a target from Makefile.objs.

Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
---
 Makefile.objs |  104 ---------------------------------------------------------
 1 files changed, 0 insertions(+), 104 deletions(-)
Juan Quintela - Nov. 8, 2011, 4:34 p.m.
"Chen Wei-Ren (陳韋任)" <chenwj@iis.sinica.edu.tw> wrote:
> From: Chen Wen-Ren <chenwj@iis.sinica.edu.tw>
>
>   Remove libqemu_common.a target from Makefile.objs.

Have you build this?  without this files qemu is not going to work.
Perhaps the naming is wrong, and we should change common-obj to
something else, but it is still needed to get things working as
expected.

Later, Juan.

> Signed-off-by: Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
> ---
>  Makefile.objs |  104 ---------------------------------------------------------
>  1 files changed, 0 insertions(+), 104 deletions(-)
>
> diff --git a/Makefile.objs b/Makefile.objs
> index d7a6539..ba8879c 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -68,110 +68,6 @@ endif
>  fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
>  
>  ######################################################################
> -# libqemu_common.a: Target independent part of system emulation. The
> -# long term path is to suppress *all* target specific code in case of
> -# system emulation, i.e. a single QEMU executable should support all
> -# CPUs and machines.
> -
> -common-obj-y = $(block-obj-y) blockdev.o
> -common-obj-y += $(net-obj-y)
> -common-obj-y += $(qobject-obj-y)
> -common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))
> -common-obj-y += readline.o console.o cursor.o
> -common-obj-y += $(oslib-obj-y)
> -common-obj-$(CONFIG_WIN32) += os-win32.o
> -common-obj-$(CONFIG_POSIX) += os-posix.o
> -
> -common-obj-y += tcg-runtime.o host-utils.o main-loop.o
> -common-obj-y += irq.o input.o
> -common-obj-$(CONFIG_PTIMER) += ptimer.o
> -common-obj-$(CONFIG_MAX7310) += max7310.o
> -common-obj-$(CONFIG_WM8750) += wm8750.o
> -common-obj-$(CONFIG_TWL92230) += twl92230.o
> -common-obj-$(CONFIG_TSC2005) += tsc2005.o
> -common-obj-$(CONFIG_LM832X) += lm832x.o
> -common-obj-$(CONFIG_TMP105) += tmp105.o
> -common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o
> -common-obj-$(CONFIG_SSD0303) += ssd0303.o
> -common-obj-$(CONFIG_SSD0323) += ssd0323.o
> -common-obj-$(CONFIG_ADS7846) += ads7846.o
> -common-obj-$(CONFIG_MAX111X) += max111x.o
> -common-obj-$(CONFIG_DS1338) += ds1338.o
> -common-obj-y += i2c.o smbus.o smbus_eeprom.o
> -common-obj-y += eeprom93xx.o
> -common-obj-y += scsi-disk.o cdrom.o
> -common-obj-y += scsi-generic.o scsi-bus.o
> -common-obj-y += hid.o
> -common-obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
> -common-obj-y += usb-serial.o usb-net.o usb-bus.o usb-desc.o
> -common-obj-$(CONFIG_SSI) += ssi.o
> -common-obj-$(CONFIG_SSI_SD) += ssi-sd.o
> -common-obj-$(CONFIG_SD) += sd.o
> -common-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
> -common-obj-y += bt-hci-csr.o
> -common-obj-y += buffered_file.o migration.o migration-tcp.o
> -common-obj-y += qemu-char.o savevm.o #aio.o
> -common-obj-y += msmouse.o ps2.o
> -common-obj-y += qdev.o qdev-properties.o
> -common-obj-y += block-migration.o iohandler.o
> -common-obj-y += pflib.o
> -common-obj-y += bitmap.o bitops.o
> -
> -common-obj-$(CONFIG_BRLAPI) += baum.o
> -common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
> -common-obj-$(CONFIG_WIN32) += version.o
> -
> -common-obj-$(CONFIG_SPICE) += ui/spice-core.o ui/spice-input.o ui/spice-display.o spice-qemu-char.o
> -
> -audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
> -audio-obj-$(CONFIG_SDL) += sdlaudio.o
> -audio-obj-$(CONFIG_OSS) += ossaudio.o
> -audio-obj-$(CONFIG_SPICE) += spiceaudio.o
> -audio-obj-$(CONFIG_COREAUDIO) += coreaudio.o
> -audio-obj-$(CONFIG_ALSA) += alsaaudio.o
> -audio-obj-$(CONFIG_DSOUND) += dsoundaudio.o
> -audio-obj-$(CONFIG_FMOD) += fmodaudio.o
> -audio-obj-$(CONFIG_ESD) += esdaudio.o
> -audio-obj-$(CONFIG_PA) += paaudio.o
> -audio-obj-$(CONFIG_WINWAVE) += winwaveaudio.o
> -audio-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o
> -audio-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o
> -audio-obj-y += wavcapture.o
> -common-obj-y += $(addprefix audio/, $(audio-obj-y))
> -
> -ui-obj-y += keymaps.o
> -ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
> -ui-obj-$(CONFIG_COCOA) += cocoa.o
> -ui-obj-$(CONFIG_CURSES) += curses.o
> -vnc-obj-y += vnc.o d3des.o
> -vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o
> -vnc-obj-y += vnc-enc-tight.o vnc-palette.o
> -vnc-obj-y += vnc-enc-zrle.o
> -vnc-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o
> -vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
> -ifdef CONFIG_VNC_THREAD
> -vnc-obj-y += vnc-jobs-async.o
> -else
> -vnc-obj-y += vnc-jobs-sync.o
> -endif
> -common-obj-y += $(addprefix ui/, $(ui-obj-y))
> -common-obj-$(CONFIG_VNC) += $(addprefix ui/, $(vnc-obj-y))
> -
> -common-obj-y += iov.o acl.o
> -common-obj-$(CONFIG_POSIX) += compatfd.o
> -common-obj-y += notify.o event_notifier.o
> -common-obj-y += qemu-timer.o qemu-timer-common.o
> -
> -slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o
> -slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
> -slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o arp_table.o
> -common-obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y))
> -
> -# xen backend driver support
> -common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o
> -common-obj-$(CONFIG_XEN_BACKEND) += xen_console.o xenfb.o xen_disk.o xen_nic.o
> -
> -######################################################################
>  # libuser
>  
>  user-obj-y =
<#secure method=pgpmime mode=sign>
陳韋任 - Nov. 8, 2011, 4:57 p.m.
> Have you build this?  without this files qemu is not going to work.
> Perhaps the naming is wrong, and we should change common-obj to
> something else, but it is still needed to get things working as
> expected.

  Sorry, I have only tested i386-linux-user when I sent the patch.
And i386-softmmu cannot be compiled. My mistake.


Regards,
chenwj
陳韋任 - Nov. 8, 2011, 5:08 p.m.
> Have you build this?  without this files qemu is not going to work.
> Perhaps the naming is wrong, and we should change common-obj to
> something else, but it is still needed to get things working as
> expected.

  I found the line below in Makefile,

$(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y) subdir-libdis

  I guess you ran into trouble while building *-softmmu? I think we can
just remove "libqemu_common.a:" from the comment of common-obj-y and
leave the rest part alone.

Regards,
chenwj
Juan Quintela - Nov. 8, 2011, 9:31 p.m.
陳韋任 <chenwj@iis.sinica.edu.tw> wrote:
>> Have you build this?  without this files qemu is not going to work.
>> Perhaps the naming is wrong, and we should change common-obj to
>> something else, but it is still needed to get things working as
>> expected.
>
>   I found the line below in Makefile,
>
> $(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y) subdir-libdis
>
>   I guess you ran into trouble while building *-softmmu? I think we can
> just remove "libqemu_common.a:" from the comment of common-obj-y and
> leave the rest part alone.

Yeap.

Later, Juan.
Andreas Färber - Nov. 8, 2011, 9:49 p.m.
Am 08.11.2011 18:08, schrieb 陳韋任:
>> Have you build this?  without this files qemu is not going to work.
>> Perhaps the naming is wrong, and we should change common-obj to
>> something else, but it is still needed to get things working as
>> expected.
> 
>   I found the line below in Makefile,
> 
> $(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y) subdir-libdis
> 
>   I guess you ran into trouble while building *-softmmu? I think we can
> just remove "libqemu_common.a:" from the comment of common-obj-y and
> leave the rest part alone.

Yes, please. I believe I'm the one to blame, I replaced the .a target
with these lists of .o files to fix the build on OpenSolaris after
constructors was introduced.

Andreas
陳韋任 - Nov. 9, 2011, 2:02 a.m.
> > $(filter %-softmmu,$(SUBDIR_RULES)): $(trace-obj-y) $(common-obj-y) subdir-libdis
> > 
> >   I guess you ran into trouble while building *-softmmu? I think we can
> > just remove "libqemu_common.a:" from the comment of common-obj-y and
> > leave the rest part alone.
> 
> Yes, please. I believe I'm the one to blame, I replaced the .a target
> with these lists of .o files to fix the build on OpenSolaris after
> constructors was introduced.

  So you agree to remove "libqemu_common.a:" from the comment or?

Regards,
chenwj

Patch

diff --git a/Makefile.objs b/Makefile.objs
index d7a6539..ba8879c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -68,110 +68,6 @@  endif
 fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
 
 ######################################################################
-# libqemu_common.a: Target independent part of system emulation. The
-# long term path is to suppress *all* target specific code in case of
-# system emulation, i.e. a single QEMU executable should support all
-# CPUs and machines.
-
-common-obj-y = $(block-obj-y) blockdev.o
-common-obj-y += $(net-obj-y)
-common-obj-y += $(qobject-obj-y)
-common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))
-common-obj-y += readline.o console.o cursor.o
-common-obj-y += $(oslib-obj-y)
-common-obj-$(CONFIG_WIN32) += os-win32.o
-common-obj-$(CONFIG_POSIX) += os-posix.o
-
-common-obj-y += tcg-runtime.o host-utils.o main-loop.o
-common-obj-y += irq.o input.o
-common-obj-$(CONFIG_PTIMER) += ptimer.o
-common-obj-$(CONFIG_MAX7310) += max7310.o
-common-obj-$(CONFIG_WM8750) += wm8750.o
-common-obj-$(CONFIG_TWL92230) += twl92230.o
-common-obj-$(CONFIG_TSC2005) += tsc2005.o
-common-obj-$(CONFIG_LM832X) += lm832x.o
-common-obj-$(CONFIG_TMP105) += tmp105.o
-common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o
-common-obj-$(CONFIG_SSD0303) += ssd0303.o
-common-obj-$(CONFIG_SSD0323) += ssd0323.o
-common-obj-$(CONFIG_ADS7846) += ads7846.o
-common-obj-$(CONFIG_MAX111X) += max111x.o
-common-obj-$(CONFIG_DS1338) += ds1338.o
-common-obj-y += i2c.o smbus.o smbus_eeprom.o
-common-obj-y += eeprom93xx.o
-common-obj-y += scsi-disk.o cdrom.o
-common-obj-y += scsi-generic.o scsi-bus.o
-common-obj-y += hid.o
-common-obj-y += usb.o usb-hub.o usb-$(HOST_USB).o usb-hid.o usb-msd.o usb-wacom.o
-common-obj-y += usb-serial.o usb-net.o usb-bus.o usb-desc.o
-common-obj-$(CONFIG_SSI) += ssi.o
-common-obj-$(CONFIG_SSI_SD) += ssi-sd.o
-common-obj-$(CONFIG_SD) += sd.o
-common-obj-y += bt.o bt-host.o bt-vhci.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o usb-bt.o
-common-obj-y += bt-hci-csr.o
-common-obj-y += buffered_file.o migration.o migration-tcp.o
-common-obj-y += qemu-char.o savevm.o #aio.o
-common-obj-y += msmouse.o ps2.o
-common-obj-y += qdev.o qdev-properties.o
-common-obj-y += block-migration.o iohandler.o
-common-obj-y += pflib.o
-common-obj-y += bitmap.o bitops.o
-
-common-obj-$(CONFIG_BRLAPI) += baum.o
-common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
-common-obj-$(CONFIG_WIN32) += version.o
-
-common-obj-$(CONFIG_SPICE) += ui/spice-core.o ui/spice-input.o ui/spice-display.o spice-qemu-char.o
-
-audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
-audio-obj-$(CONFIG_SDL) += sdlaudio.o
-audio-obj-$(CONFIG_OSS) += ossaudio.o
-audio-obj-$(CONFIG_SPICE) += spiceaudio.o
-audio-obj-$(CONFIG_COREAUDIO) += coreaudio.o
-audio-obj-$(CONFIG_ALSA) += alsaaudio.o
-audio-obj-$(CONFIG_DSOUND) += dsoundaudio.o
-audio-obj-$(CONFIG_FMOD) += fmodaudio.o
-audio-obj-$(CONFIG_ESD) += esdaudio.o
-audio-obj-$(CONFIG_PA) += paaudio.o
-audio-obj-$(CONFIG_WINWAVE) += winwaveaudio.o
-audio-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o
-audio-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o
-audio-obj-y += wavcapture.o
-common-obj-y += $(addprefix audio/, $(audio-obj-y))
-
-ui-obj-y += keymaps.o
-ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
-ui-obj-$(CONFIG_COCOA) += cocoa.o
-ui-obj-$(CONFIG_CURSES) += curses.o
-vnc-obj-y += vnc.o d3des.o
-vnc-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o
-vnc-obj-y += vnc-enc-tight.o vnc-palette.o
-vnc-obj-y += vnc-enc-zrle.o
-vnc-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o
-vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
-ifdef CONFIG_VNC_THREAD
-vnc-obj-y += vnc-jobs-async.o
-else
-vnc-obj-y += vnc-jobs-sync.o
-endif
-common-obj-y += $(addprefix ui/, $(ui-obj-y))
-common-obj-$(CONFIG_VNC) += $(addprefix ui/, $(vnc-obj-y))
-
-common-obj-y += iov.o acl.o
-common-obj-$(CONFIG_POSIX) += compatfd.o
-common-obj-y += notify.o event_notifier.o
-common-obj-y += qemu-timer.o qemu-timer-common.o
-
-slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o
-slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
-slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o arp_table.o
-common-obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y))
-
-# xen backend driver support
-common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o
-common-obj-$(CONFIG_XEN_BACKEND) += xen_console.o xenfb.o xen_disk.o xen_nic.o
-
-######################################################################
 # libuser
 
 user-obj-y =