Diff for /qemu/Makefile.target between versions 1.1.1.7 and 1.1.1.8

version 1.1.1.7, 2018/04/24 16:50:55 version 1.1.1.8, 2018/04/24 17:21:05
Line 1 Line 1
 include config.mak  include config.mak
 include $(SRC_PATH)/rules.mak  include $(SRC_PATH)/rules.mak
   
 TARGET_BASE_ARCH:=$(TARGET_ARCH)  
 ifeq ($(TARGET_ARCH), x86_64)  
 TARGET_BASE_ARCH:=i386  
 endif  
 ifeq ($(TARGET_ARCH), mipsn32)  
 TARGET_BASE_ARCH:=mips  
 endif  
 ifeq ($(TARGET_ARCH), mips64)  
 TARGET_BASE_ARCH:=mips  
 endif  
 ifeq ($(TARGET_ARCH), ppc64)  
 TARGET_BASE_ARCH:=ppc  
 endif  
 ifeq ($(TARGET_ARCH), ppc64h)  
 TARGET_BASE_ARCH:=ppc  
 endif  
 ifeq ($(TARGET_ARCH), ppcemb)  
 TARGET_BASE_ARCH:=ppc  
 endif  
 ifeq ($(TARGET_ARCH), sparc64)  
 TARGET_BASE_ARCH:=sparc  
 endif  
 TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)  TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
 VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw  VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
 CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H  CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
 #CFLAGS+=-Werror  #CFLAGS+=-Werror
 LIBS=  LIBS=
 # user emulator name  
 ifndef TARGET_ARCH2  
 TARGET_ARCH2=$(TARGET_ARCH)  
 endif  
 ifeq ($(TARGET_ARCH),arm)  
   ifeq ($(TARGET_WORDS_BIGENDIAN),yes)  
     TARGET_ARCH2=armeb  
   endif  
 endif  
 ifeq ($(TARGET_ARCH),sh4)  
   ifeq ($(TARGET_WORDS_BIGENDIAN),yes)  
     TARGET_ARCH2=sh4eb  
   endif  
 endif  
 ifeq ($(TARGET_ARCH),mips)  
   ifneq ($(TARGET_WORDS_BIGENDIAN),yes)  
     TARGET_ARCH2=mipsel  
   endif  
 endif  
 ifeq ($(TARGET_ARCH),mipsn32)  
   ifneq ($(TARGET_WORDS_BIGENDIAN),yes)  
     TARGET_ARCH2=mipsn32el  
   endif  
 endif  
 ifeq ($(TARGET_ARCH),mips64)  
   ifneq ($(TARGET_WORDS_BIGENDIAN),yes)  
     TARGET_ARCH2=mips64el  
   endif  
 endif  
   
 ifdef CONFIG_USER_ONLY  ifdef CONFIG_USER_ONLY
 # user emulator name  # user emulator name
Line 84  ifeq ($(ARCH),i386) Line 33  ifeq ($(ARCH),i386)
 HELPER_CFLAGS+=-fomit-frame-pointer  HELPER_CFLAGS+=-fomit-frame-pointer
 endif  endif
   
 ifeq ($(ARCH),sparc)  ifeq ($(subst ppc64,ppc,$(ARCH))$(TARGET_BASE_ARCH),ppcppc)
   CFLAGS+=-ffixed-g2 -ffixed-g3  translate.o: CFLAGS := $(CFLAGS) $(call cc-option, $(CFLAGS), -fno-unit-at-a-time,)
   ifneq ($(CONFIG_SOLARIS),yes)  
     CFLAGS+=-ffixed-g1 -ffixed-g6  
     HELPER_CFLAGS+=-ffixed-i0  
   endif  
 endif  endif
   
 ifeq ($(ARCH),sparc64)  ifeq ($(ARCH),sparc)
   ifneq ($(CONFIG_SOLARIS),yes)    ifneq ($(CONFIG_SOLARIS),y)
     CFLAGS+=-ffixed-g5 -ffixed-g6 -ffixed-g7      HELPER_CFLAGS+=-ffixed-i0
   else  
     CFLAGS+=-ffixed-g1 -ffixed-g4 -ffixed-g5 -ffixed-g7  
   endif    endif
 endif  endif
   
Line 105  ifeq ($(ARCH),alpha) Line 48  ifeq ($(ARCH),alpha)
 CFLAGS+=-msmall-data  CFLAGS+=-msmall-data
 endif  endif
   
 ifeq ($(ARCH),hppa)  
 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld  
 endif  
   
 ifeq ($(ARCH),ia64)  ifeq ($(ARCH),ia64)
 CFLAGS+=-mno-sdata  CFLAGS+=-mno-sdata
 endif  endif
   
 CFLAGS+=$(OS_CFLAGS) $(ARCH_CFLAGS)  
 LDFLAGS+=$(OS_LDFLAGS) $(ARCH_LDFLAGS)  
   
 CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE  CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
   CPPFLAGS+=-U_FORTIFY_SOURCE
 LIBS+=-lm  LIBS+=-lm
 ifdef CONFIG_WIN32  ifdef CONFIG_WIN32
 LIBS+=-lwinmm -lws2_32 -liphlpapi  LIBS+=-lwinmm -lws2_32 -liphlpapi
Line 134  kvm.o: CFLAGS+=$(KVM_CFLAGS) Line 71  kvm.o: CFLAGS+=$(KVM_CFLAGS)
 kvm-all.o: CFLAGS+=$(KVM_CFLAGS)  kvm-all.o: CFLAGS+=$(KVM_CFLAGS)
   
 all: $(PROGS)  all: $(PROGS)
   # Dummy command so that make thinks it has done something
           @true
   
 #########################################################  #########################################################
 # cpu emulator library  # cpu emulator library
 LIBOBJS=exec.o kqemu.o translate-all.o cpu-exec.o\  libobj-y = exec.o translate-all.o cpu-exec.o translate.o host-utils.o
         translate.o host-utils.o  libobj-$(CONFIG_KQEMU) += kqemu.o
 # TCG code generator  # TCG code generator
 LIBOBJS+= tcg/tcg.o tcg/tcg-runtime.o  libobj-y += tcg/tcg.o tcg/tcg-runtime.o
 CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)  CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH)
 ifeq ($(ARCH),sparc64)  ifeq ($(ARCH),sparc64)
 CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc  CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc
 endif  endif
 ifdef CONFIG_SOFTFLOAT  ifdef CONFIG_SOFTFLOAT
 LIBOBJS+=fpu/softfloat.o  libobj-y += fpu/softfloat.o
 else  else
 LIBOBJS+=fpu/softfloat-native.o  libobj-y += fpu/softfloat-native.o
 endif  endif
 CPPFLAGS+=-I$(SRC_PATH)/fpu  CPPFLAGS+=-I$(SRC_PATH)/fpu
 LIBOBJS+= op_helper.o helper.o  libobj-y += op_helper.o helper.o
   
 ifeq ($(TARGET_BASE_ARCH), arm)  ifeq ($(TARGET_BASE_ARCH), arm)
 LIBOBJS+= neon_helper.o iwmmxt_helper.o  libobj-y += neon_helper.o iwmmxt_helper.o
 endif  endif
   
 ifeq ($(TARGET_BASE_ARCH), alpha)  ifeq ($(TARGET_BASE_ARCH), alpha)
 LIBOBJS+= alpha_palcode.o  libobj-y += alpha_palcode.o
 endif  endif
   
 ifeq ($(TARGET_BASE_ARCH), cris)  ifeq ($(TARGET_BASE_ARCH), cris)
 LIBOBJS+= cris-dis.o  libobj-y += cris-dis.o
   
 ifndef CONFIG_USER_ONLY  ifndef CONFIG_USER_ONLY
 LIBOBJS+= mmu.o  libobj-y += mmu.o
 endif  endif
 endif  endif
   
 # NOTE: the disassembler code is only needed for debugging  # NOTE: the disassembler code is only needed for debugging
 LIBOBJS+=disas.o  libobj-y += disas.o
 ifeq ($(findstring i386, $(TARGET_ARCH) $(ARCH)),i386)  ifeq ($(findstring i386, $(TARGET_ARCH) $(ARCH)),i386)
 USE_I386_DIS=y  USE_I386_DIS=y
 endif  endif
 ifeq ($(findstring x86_64, $(TARGET_ARCH) $(ARCH)),x86_64)  ifeq ($(findstring x86_64, $(TARGET_ARCH) $(ARCH)),x86_64)
 USE_I386_DIS=y  USE_I386_DIS=y
 endif  endif
 ifdef USE_I386_DIS  libobj-$(USE_I386_DIS) += i386-dis.o
 LIBOBJS+=i386-dis.o  
 endif  
 ifeq ($(findstring alpha, $(TARGET_ARCH) $(ARCH)),alpha)  ifeq ($(findstring alpha, $(TARGET_ARCH) $(ARCH)),alpha)
 LIBOBJS+=alpha-dis.o  libobj-y += alpha-dis.o
 endif  endif
 ifeq ($(findstring ppc, $(TARGET_BASE_ARCH) $(ARCH)),ppc)  ifeq ($(findstring ppc, $(TARGET_BASE_ARCH) $(ARCH)),ppc)
 LIBOBJS+=ppc-dis.o  libobj-y += ppc-dis.o
   endif
   ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze)
   libobj-y += microblaze-dis.o
   ifndef CONFIG_USER_ONLY
   libobj-y += mmu.o
   endif
 endif  endif
 ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips)  ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips)
 LIBOBJS+=mips-dis.o  libobj-y += mips-dis.o
 endif  endif
 ifeq ($(findstring sparc, $(TARGET_BASE_ARCH) $(ARCH)),sparc)  ifeq ($(findstring sparc, $(TARGET_BASE_ARCH) $(ARCH)),sparc)
 LIBOBJS+=sparc-dis.o  libobj-y += sparc-dis.o
 endif  endif
 ifeq ($(findstring arm, $(TARGET_ARCH) $(ARCH)),arm)  ifeq ($(findstring arm, $(TARGET_ARCH) $(ARCH)),arm)
 LIBOBJS+=arm-dis.o  libobj-y += arm-dis.o
 endif  endif
 ifeq ($(findstring m68k, $(TARGET_ARCH) $(ARCH)),m68k)  ifeq ($(findstring m68k, $(TARGET_ARCH) $(ARCH)),m68k)
 LIBOBJS+=m68k-dis.o  libobj-y += m68k-dis.o
 endif  endif
 ifeq ($(findstring sh4, $(TARGET_ARCH) $(ARCH)),sh4)  ifeq ($(findstring sh4, $(TARGET_ARCH) $(ARCH)),sh4)
 LIBOBJS+=sh4-dis.o  libobj-y += sh4-dis.o
 endif  endif
 ifeq ($(findstring hppa, $(TARGET_BASE_ARCH) $(ARCH)),hppa)  ifeq ($(findstring hppa, $(TARGET_BASE_ARCH) $(ARCH)),hppa)
 LIBOBJS+=hppa-dis.o  libobj-y += hppa-dis.o
 endif  endif
 ifeq ($(findstring s390, $(TARGET_ARCH) $(ARCH)),s390)  ifeq ($(findstring s390, $(TARGET_ARCH) $(ARCH)),s390)
 LIBOBJS+=s390-dis.o  libobj-y += s390-dis.o
 endif  endif
   
 # libqemu  # libqemu
   
 libqemu.a: $(LIBOBJS)  libqemu.a: $(libobj-y)
   
 translate.o: translate.c cpu.h  translate.o: translate.c cpu.h
   
Line 220  tcg/tcg.o: cpu.h Line 163  tcg/tcg.o: cpu.h
   
 # HELPER_CFLAGS is used for all the code compiled with static register  # HELPER_CFLAGS is used for all the code compiled with static register
 # variables  # variables
 op_helper.o: CFLAGS += $(HELPER_CFLAGS) $(I386_CFLAGS)  op_helper.o: CFLAGS += $(HELPER_CFLAGS)
   
 cpu-exec.o: CFLAGS += $(HELPER_CFLAGS)  cpu-exec.o: CFLAGS += $(HELPER_CFLAGS)
   
Line 229  cpu-exec.o: CFLAGS += $(HELPER_CFLAGS) Line 172  cpu-exec.o: CFLAGS += $(HELPER_CFLAGS)
   
 ifdef CONFIG_LINUX_USER  ifdef CONFIG_LINUX_USER
   
 ifndef TARGET_ABI_DIR  
   TARGET_ABI_DIR=$(TARGET_ARCH)  
 endif  
 VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)  VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
 CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)  CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
   
Line 319  LDFLAGS+=-p Line 259  LDFLAGS+=-p
 CFLAGS+=-p  CFLAGS+=-p
 endif  endif
   
 OBJS= main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \  obj-y = main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \
       elfload.o linuxload.o uaccess.o envlist.o        elfload.o linuxload.o uaccess.o envlist.o gdbstub.o gdbstub-xml.o \
 LIBS+= $(AIOLIBS)        ioport-user.o
 ifdef TARGET_HAS_BFLT  obj-$(TARGET_HAS_BFLT) += flatload.o
 OBJS+= flatload.o  
 endif  
 ifdef TARGET_HAS_ELFLOAD32  ifdef TARGET_HAS_ELFLOAD32
 OBJS+= elfload32.o  
 elfload32.o: elfload.c  elfload32.o: elfload.c
 endif  endif
   obj-$(TARGET_HAS_ELFLOAD32) += elfload32.o
   
 ifeq ($(TARGET_ARCH), i386)  ifeq ($(TARGET_ARCH), i386)
 OBJS+= vm86.o  obj-y += vm86.o
 endif  
 ifeq ($(TARGET_ARCH), arm)  
 OBJS+=nwfpe/fpa11.o nwfpe/fpa11_cpdo.o \  
 nwfpe/fpa11_cpdt.o nwfpe/fpa11_cprt.o nwfpe/fpopcode.o nwfpe/single_cpdo.o \  
  nwfpe/double_cpdo.o nwfpe/extended_cpdo.o arm-semi.o  
 endif  
 ifeq ($(TARGET_ARCH), m68k)  
 OBJS+= m68k-sim.o m68k-semi.o  
 endif  endif
   
 ifdef CONFIG_GDBSTUB  nwfpe-obj-y := fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o
 OBJS+=gdbstub.o gdbstub-xml.o  nwfpe-obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o
 endif  obj-arm-y +=  $(addprefix nwfpe/, $(nwfpe-obj-y))
   obj-arm-y += arm-semi.o
   
 OBJS+= libqemu.a  obj-m68k-y += m68k-sim.o m68k-semi.o
   
 # Note: this is a workaround. The real fix is to avoid compiling  # Note: this is a workaround. The real fix is to avoid compiling
 # cpu_signal_handler() in cpu-exec.c.  # cpu_signal_handler() in cpu-exec.c.
 signal.o: CFLAGS += $(HELPER_CFLAGS)  signal.o: CFLAGS += $(HELPER_CFLAGS)
   
 $(QEMU_PROG): $(OBJS) ../libqemu_user.a  ARLIBS=../libqemu_user.a libqemu.a
         $(LINK)  
 ifeq ($(ARCH),alpha)  
 # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of  
 # the address space (31 bit so sign extending doesn't matter)  
         echo -ne '\001\000\000\000' | dd of=qemu bs=1 seek=48 count=4 conv=notrunc  
 endif  
   
 endif #CONFIG_LINUX_USER  endif #CONFIG_LINUX_USER
   
   LIBS+= $(PTHREADLIBS)
   LIBS+= $(CLOCKLIBS)
   
 #########################################################  #########################################################
 # Darwin user emulator target  # Darwin user emulator target
   
Line 375  LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x Line 303  LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x
   
 LIBS+=-lmx  LIBS+=-lmx
   
 OBJS= main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o  obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \
           gdbstub.o gdbstub-xml.o ioport-user.o
 OBJS+= libqemu.a  
   
 ifdef CONFIG_GDBSTUB  
 OBJS+=gdbstub.o gdbstub-xml.o  
 endif  
   
 # Note: this is a workaround. The real fix is to avoid compiling  # Note: this is a workaround. The real fix is to avoid compiling
 # cpu_signal_handler() in cpu-exec.c.  # cpu_signal_handler() in cpu-exec.c.
 signal.o: CFLAGS += $(HELPER_CFLAGS)  signal.o: CFLAGS += $(HELPER_CFLAGS)
   
 $(QEMU_PROG): $(OBJS)  ARLIBS=libqemu.a
         $(LINK)  
   
 endif #CONFIG_DARWIN_USER  endif #CONFIG_DARWIN_USER
   
Line 478  LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld Line 400  LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld
 endif  endif
 endif  endif
   
 OBJS= main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o syscall.o  obj-y = main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o syscall.o \
 OBJS+= uaccess.o          gdbstub.o gdbstub-xml.o ioport-user.o
   obj-y += uaccess.o
 OBJS+= libqemu.a  
   
 ifdef CONFIG_GDBSTUB  
 OBJS+=gdbstub.o  
 endif  
   
 # Note: this is a workaround. The real fix is to avoid compiling  # Note: this is a workaround. The real fix is to avoid compiling
 # cpu_signal_handler() in cpu-exec.c.  # cpu_signal_handler() in cpu-exec.c.
 signal.o: CFLAGS += $(HELPER_CFLAGS)  signal.o: CFLAGS += $(HELPER_CFLAGS)
   
 $(QEMU_PROG): $(OBJS) ../libqemu_user.a  ARLIBS=libqemu.a ../libqemu_user.a
         $(LINK)  
   
 endif #CONFIG_BSD_USER  endif #CONFIG_BSD_USER
   
Line 500  endif #CONFIG_BSD_USER Line 416  endif #CONFIG_BSD_USER
 # System emulator target  # System emulator target
 ifndef CONFIG_USER_ONLY  ifndef CONFIG_USER_ONLY
   
 OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o dma-helpers.o  obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \
           gdbstub.o gdbstub-xml.o msix.o ioport.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.  # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly  # need to fix this properly
 OBJS+=virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o  obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o
 OBJS+=fw_cfg.o  obj-$(CONFIG_KVM) += kvm.o kvm-all.o
 ifdef CONFIG_KVM  
 OBJS+=kvm.o kvm-all.o  
 endif  
 ifdef CONFIG_WIN32  
 OBJS+=block-raw-win32.o  
 else  
 ifdef CONFIG_AIO  
 OBJS+=posix-aio-compat.o  
 endif  
 OBJS+=block-raw-posix.o  
 endif  
   
 LIBS+=-lz  LIBS+=-lz
 ifdef CONFIG_ALSA  ifdef CONFIG_ALSA
Line 537  ifdef CONFIG_OSS Line 443  ifdef CONFIG_OSS
 LIBS += $(CONFIG_OSS_LIB)  LIBS += $(CONFIG_OSS_LIB)
 endif  endif
   
 SOUND_HW = sb16.o es1370.o ac97.o  sound-obj-y =
   sound-obj-$(CONFIG_SB16) += sb16.o
   sound-obj-$(CONFIG_ES1370) += es1370.o
   sound-obj-$(CONFIG_AC97) += ac97.o
   sound-obj-$(CONFIG_ADLIB) += fmopl.o adlib.o
   sound-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o
   sound-obj-$(CONFIG_CS4231A) += cs4231a.o
   
 ifdef CONFIG_ADLIB  ifdef CONFIG_ADLIB
 SOUND_HW += fmopl.o adlib.o  
 adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0  adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
 endif  endif
 ifdef CONFIG_GUS  
 SOUND_HW += gus.o gusemu_hal.o gusemu_mixer.o  
 endif  
 ifdef CONFIG_CS4231A  
 SOUND_HW += cs4231a.o  
 endif  
   
 ifdef CONFIG_VNC_TLS  ifdef CONFIG_VNC_TLS
 CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)  CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
 LIBS += $(CONFIG_VNC_TLS_LIBS)  LIBS += $(CONFIG_VNC_TLS_LIBS)
 endif  endif
   
   ifdef CONFIG_VNC_SASL
   CPPFLAGS += $(CONFIG_VNC_SASL_CFLAGS)
   LIBS += $(CONFIG_VNC_SASL_LIBS)
   endif
   
 ifdef CONFIG_BLUEZ  ifdef CONFIG_BLUEZ
 LIBS += $(CONFIG_BLUEZ_LIBS)  LIBS += $(CONFIG_BLUEZ_LIBS)
 endif  endif
   
 # SCSI layer  # xen backend driver support
 OBJS+= lsi53c895a.o esp.o  obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
   ifeq ($(CONFIG_XEN), y)
     LIBS += $(XEN_LIBS)
   endif
   
 # USB layer  # USB layer
 OBJS+= usb-ohci.o  obj-y += usb-ohci.o
   
 # EEPROM emulation  
 OBJS += eeprom93xx.o  
   
 # PCI network cards  # PCI network cards
 OBJS += eepro100.o  obj-y += eepro100.o
 OBJS += ne2000.o  obj-y += ne2000.o
 OBJS += pcnet.o  obj-y += pcnet.o
 OBJS += rtl8139.o  obj-y += rtl8139.o
 OBJS += e1000.o  obj-y += e1000.o
   
 # Serial mouse  # Generic watchdog support and some watchdog devices
 OBJS += msmouse.o  obj-y += wdt_ib700.o wdt_i6300esb.o
   
 ifeq ($(TARGET_BASE_ARCH), i386)  
 # Hardware support  # Hardware support
 OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o  obj-i386-y = ide.o pckbd.o vga.o $(sound-obj-y) dma.o
 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o  obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
 OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o  obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o
 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o  obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
 OBJS += device-hotplug.o pci-hotplug.o  obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o
   
   ifeq ($(TARGET_BASE_ARCH), i386)
 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE  CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif  endif
 ifeq ($(TARGET_BASE_ARCH), ppc)  
 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE  
 # shared objects  # shared objects
 OBJS+= ppc.o ide.o vga.o $(SOUND_HW) dma.o openpic.o  obj-ppc-y = ppc.o ide.o vga.o $(sound-obj-y) dma.o openpic.o
 # PREP target  # PREP target
 OBJS+= pckbd.o ps2.o serial.o i8259.o i8254.o fdc.o m48t59.o mc146818rtc.o  obj-ppc-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o
 OBJS+= prep_pci.o ppc_prep.o  obj-ppc-y += prep_pci.o ppc_prep.o
 # Mac shared devices  # Mac shared devices
 OBJS+= macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o escc.o  obj-ppc-y += macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o
 # OldWorld PowerMac  # OldWorld PowerMac
 OBJS+= heathrow_pic.o grackle_pci.o ppc_oldworld.o  obj-ppc-y += heathrow_pic.o grackle_pci.o ppc_oldworld.o
 # NewWorld PowerMac  # NewWorld PowerMac
 OBJS+= unin_pci.o ppc_newworld.o  obj-ppc-y += unin_pci.o ppc_newworld.o
 # PowerPC 4xx boards  # PowerPC 4xx boards
 OBJS+= pflash_cfi02.o ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o  obj-ppc-y += pflash_cfi02.o ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
 OBJS+= ppc440.o ppc440_bamboo.o  obj-ppc-y += ppc440.o ppc440_bamboo.o
 # PowerPC E500 boards  # PowerPC E500 boards
 OBJS+= ppce500_pci.o ppce500_mpc8544ds.o  obj-ppc-y += ppce500_pci.o ppce500_mpc8544ds.o
   obj-ppc-$(CONFIG_KVM) += kvm_ppc.o
   
   ifeq ($(TARGET_BASE_ARCH), ppc)
   CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
   endif
   
 ifdef FDT_LIBS  ifdef FDT_LIBS
 OBJS+= device_tree.o  obj-ppc-y += device_tree.o
 LIBS+= $(FDT_LIBS)  LIBS+= $(FDT_LIBS)
 endif  endif
 ifdef CONFIG_KVM  
 OBJS+= kvm_ppc.o  obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
 endif  obj-mips-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o
 endif  obj-mips-y += g364fb.o jazz_led.o dp8393x.o
   obj-mips-y += ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
   obj-mips-y += piix_pci.o parallel.o cirrus_vga.o pcspk.o $(sound-obj-y)
   obj-mips-y += mipsnet.o
   obj-mips-y += pflash_cfi01.o
   obj-mips-y += vmware_vga.o
   
 ifeq ($(TARGET_BASE_ARCH), mips)  ifeq ($(TARGET_BASE_ARCH), mips)
 OBJS+= mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o  
 OBJS+= mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o  
 OBJS+= g364fb.o jazz_led.o  
 OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o  
 OBJS+= piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW)  
 OBJS+= mipsnet.o  
 OBJS+= pflash_cfi01.o  
 OBJS+= vmware_vga.o  
 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE  CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif  endif
 ifeq ($(TARGET_BASE_ARCH), cris)  
   obj-microblaze-y = petalogix_s3adsp1800_mmu.o
   
   obj-microblaze-y += microblaze_pic_cpu.o
   obj-microblaze-y += xilinx_intc.o
   obj-microblaze-y += xilinx_timer.o
   obj-microblaze-y += xilinx_uartlite.o
   obj-microblaze-y += xilinx_ethlite.o
   
   obj-microblaze-y += pflash_cfi02.o
   
   ifdef FDT_LIBS
   obj-microblaze-y += device_tree.o
   LIBS+= $(FDT_LIBS)
   endif
   
 # Boards  # Boards
 OBJS+= etraxfs.o axis_dev88.o  obj-cris-y = cris_pic_cpu.o etraxfs.o axis_dev88.o
   
 # IO blocks  # IO blocks
 OBJS+= etraxfs_dma.o  obj-cris-y += etraxfs_dma.o
 OBJS+= etraxfs_pic.o  obj-cris-y += etraxfs_pic.o
 OBJS+= etraxfs_eth.o  obj-cris-y += etraxfs_eth.o
 OBJS+= etraxfs_timer.o  obj-cris-y += etraxfs_timer.o
 OBJS+= etraxfs_ser.o  obj-cris-y += etraxfs_ser.o
   
   obj-cris-y += pflash_cfi02.o
   
 OBJS+= ptimer.o  
 OBJS+= pflash_cfi02.o nand.o  
 endif  
 ifeq ($(TARGET_BASE_ARCH), sparc)  
 ifeq ($(TARGET_ARCH), sparc64)  ifeq ($(TARGET_ARCH), sparc64)
 OBJS+= sun4u.o ide.o pckbd.o ps2.o vga.o apb_pci.o  obj-sparc-y = sun4u.o ide.o pckbd.o vga.o apb_pci.o
 OBJS+= fdc.o mc146818rtc.o serial.o m48t59.o  obj-sparc-y += fdc.o mc146818rtc.o serial.o
 OBJS+= cirrus_vga.o parallel.o ptimer.o  obj-sparc-y += cirrus_vga.o parallel.o
 else  else
 OBJS+= sun4m.o tcx.o pcnet.o iommu.o m48t59.o slavio_intctl.o  obj-sparc-y = sun4m.o tcx.o iommu.o slavio_intctl.o
 OBJS+= slavio_timer.o escc.o slavio_misc.o fdc.o sparc32_dma.o  obj-sparc-y += slavio_timer.o slavio_misc.o fdc.o sparc32_dma.o
 OBJS+= cs4231.o ptimer.o eccmemctl.o sbi.o sun4c_intctl.o  obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
 endif  endif
 endif  
   obj-arm-y = integratorcp.o versatilepb.o smc91c111.o arm_pic.o arm_timer.o
   obj-arm-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o
   obj-arm-y += versatile_pci.o
   obj-arm-y += realview_gic.o realview.o arm_sysctl.o mpcore.o
   obj-arm-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o
   obj-arm-y += pl061.o
   obj-arm-y += arm-semi.o
   obj-arm-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
   obj-arm-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
   obj-arm-y += pflash_cfi01.o gumstix.o
   obj-arm-y += zaurus.o ide.o serial.o spitz.o tosa.o tc6393xb.o
   obj-arm-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o
   obj-arm-y += omap2.o omap_dss.o soc_dma.o
   obj-arm-y += omap_sx1.o palm.o tsc210x.o
   obj-arm-y += nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
   obj-arm-y += mst_fpga.o mainstone.o
   obj-arm-y += musicpal.o pflash_cfi02.o
   obj-arm-y += framebuffer.o
   obj-arm-y += syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o
   obj-arm-y += syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o
   obj-arm-y += syborg_virtio.o
   
 ifeq ($(TARGET_BASE_ARCH), arm)  ifeq ($(TARGET_BASE_ARCH), arm)
 OBJS+= integratorcp.o versatilepb.o ps2.o smc91c111.o arm_pic.o arm_timer.o  
 OBJS+= arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o  
 OBJS+= versatile_pci.o ptimer.o  
 OBJS+= realview_gic.o realview.o arm_sysctl.o mpcore.o  
 OBJS+= armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o  
 OBJS+= pl061.o  
 OBJS+= arm-semi.o  
 OBJS+= pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o  
 OBJS+= pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o  
 OBJS+= pflash_cfi01.o gumstix.o  
 OBJS+= zaurus.o ide.o serial.o nand.o ecc.o spitz.o tosa.o tc6393xb.o  
 OBJS+= omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o  
 OBJS+= omap2.o omap_dss.o soc_dma.o  
 OBJS+= omap_sx1.o palm.o tsc210x.o  
 OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o  
 OBJS+= tsc2005.o bt-hci-csr.o  
 OBJS+= mst_fpga.o mainstone.o  
 OBJS+= musicpal.o pflash_cfi02.o  
 CPPFLAGS += -DHAS_AUDIO  CPPFLAGS += -DHAS_AUDIO
 endif  endif
 ifeq ($(TARGET_BASE_ARCH), sh4)  
 OBJS+= shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o  obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o
 OBJS+= sh_timer.o ptimer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o  obj-sh4-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o
 OBJS+= ide.o  obj-sh4-y += ide.o
 endif  
 ifeq ($(TARGET_BASE_ARCH), m68k)  obj-m68k-y = an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o
 OBJS+= an5206.o mcf5206.o ptimer.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o  obj-m68k-y += m68k-semi.o dummy_m68k.o
 OBJS+= m68k-semi.o dummy_m68k.o  
 endif  
 ifdef CONFIG_GDBSTUB  
 OBJS+=gdbstub.o gdbstub-xml.o  
 endif  
 ifdef CONFIG_COCOA  ifdef CONFIG_COCOA
 COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit  COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit
 ifdef CONFIG_COREAUDIO  ifdef CONFIG_COREAUDIO
Line 691  ifdef CONFIG_SLIRP Line 619  ifdef CONFIG_SLIRP
 CPPFLAGS+=-I$(SRC_PATH)/slirp  CPPFLAGS+=-I$(SRC_PATH)/slirp
 endif  endif
   
 LIBS+=$(AIOLIBS)  
 # specific flags are needed for non soft mmu emulator  # specific flags are needed for non soft mmu emulator
 ifdef CONFIG_STATIC  ifdef CONFIG_STATIC
 LDFLAGS+=-static  LDFLAGS+=-static
Line 724  LDFLAGS+=-p Line 651  LDFLAGS+=-p
 main.o: CFLAGS+=-p  main.o: CFLAGS+=-p
 endif  endif
   
 $(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS)  vl.o: CFLAGS+=$(SDL_CFLAGS)
   
 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a  vl.o: qemu-options.h
         $(LINK)  
   monitor.o: qemu-monitor.h
   
   LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS)
   ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
   
 endif # !CONFIG_USER_ONLY  endif # !CONFIG_USER_ONLY
   
   $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS)
           $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
   
   
 gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh  gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh
         rm -f $@  
 ifeq ($(TARGET_XML_FILES),)  ifeq ($(TARGET_XML_FILES),)
         echo > $@          $(call quiet-command,rm -f $@ && echo > $@,"  GEN   $(TARGET_DIR)$@")
 else  else
         $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)          $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES),"  GEN   $(TARGET_DIR)$@")
 endif  endif
   
   qemu-options.h: $(SRC_PATH)/qemu-options.hx
           $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")
   
   qemu-monitor.h: $(SRC_PATH)/qemu-monitor.hx
           $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")
   
 clean:  clean:
         rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o          rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
         rm -f *.d */*.d tcg/*.o          rm -f *.d */*.d tcg/*.o
           rm -f qemu-options.h qemu-monitor.h gdbstub-xml.c
   
 install: all  install: all
 ifneq ($(PROGS),)  ifneq ($(PROGS),)
         $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"          $(INSTALL) -m 755 $(STRIP_OPT) $(PROGS) "$(DESTDIR)$(bindir)"
 endif  endif
   
 # Include automatically generated dependency files  # Include automatically generated dependency files

Removed from v.1.1.1.7  
changed lines
  Added in v.1.1.1.8


unix.superglobalmegacorp.com