Diff for /qemu/Makefile.target between versions 1.1.1.5 and 1.1.1.6

version 1.1.1.5, 2018/04/24 16:45:08 version 1.1.1.6, 2018/04/24 16:47:34
Line 4  TARGET_BASE_ARCH:=$(TARGET_ARCH) Line 4  TARGET_BASE_ARCH:=$(TARGET_ARCH)
 ifeq ($(TARGET_ARCH), x86_64)  ifeq ($(TARGET_ARCH), x86_64)
 TARGET_BASE_ARCH:=i386  TARGET_BASE_ARCH:=i386
 endif  endif
   ifeq ($(TARGET_ARCH), mipsn32)
   TARGET_BASE_ARCH:=mips
   endif
   ifeq ($(TARGET_ARCH), mips64)
   TARGET_BASE_ARCH:=mips
   endif
 ifeq ($(TARGET_ARCH), ppc64)  ifeq ($(TARGET_ARCH), ppc64)
 TARGET_BASE_ARCH:=ppc  TARGET_BASE_ARCH:=ppc
 endif  endif
   ifeq ($(TARGET_ARCH), ppc64h)
   TARGET_BASE_ARCH:=ppc
   endif
   ifeq ($(TARGET_ARCH), ppcemb)
   TARGET_BASE_ARCH:=ppc
   endif
 ifeq ($(TARGET_ARCH), sparc64)  ifeq ($(TARGET_ARCH), sparc64)
 TARGET_BASE_ARCH:=sparc  TARGET_BASE_ARCH:=sparc
 endif  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:$(SRC_PATH)/audio  VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
 CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH)  CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MP -DNEED_CPU_H
 ifdef CONFIG_DARWIN_USER  ifdef CONFIG_DARWIN_USER
 VPATH+=:$(SRC_PATH)/darwin-user  VPATH+=:$(SRC_PATH)/darwin-user
 CPPFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH)  CPPFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH)
 endif  endif
 ifdef CONFIG_LINUX_USER  ifdef CONFIG_LINUX_USER
 VPATH+=:$(SRC_PATH)/linux-user  VPATH+=:$(SRC_PATH)/linux-user
 CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)  ifndef TARGET_ABI_DIR
     TARGET_ABI_DIR=$(TARGET_ARCH)
   endif
   CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
 endif  endif
 BASE_CFLAGS=  BASE_CFLAGS=
 BASE_LDFLAGS=  BASE_LDFLAGS=
Line 28  LIBS= Line 43  LIBS=
 HELPER_CFLAGS=$(CFLAGS)  HELPER_CFLAGS=$(CFLAGS)
 DYNGEN=../dyngen$(EXESUF)  DYNGEN=../dyngen$(EXESUF)
 # user emulator name  # user emulator name
   ifndef TARGET_ARCH2
 TARGET_ARCH2=$(TARGET_ARCH)  TARGET_ARCH2=$(TARGET_ARCH)
   endif
 ifeq ($(TARGET_ARCH),arm)  ifeq ($(TARGET_ARCH),arm)
   ifeq ($(TARGET_WORDS_BIGENDIAN),yes)    ifeq ($(TARGET_WORDS_BIGENDIAN),yes)
     TARGET_ARCH2=armeb      TARGET_ARCH2=armeb
Line 44  ifeq ($(TARGET_ARCH),mips) Line 61  ifeq ($(TARGET_ARCH),mips)
     TARGET_ARCH2=mipsel      TARGET_ARCH2=mipsel
   endif    endif
 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
 QEMU_USER=qemu-$(TARGET_ARCH2)  QEMU_USER=qemu-$(TARGET_ARCH2)
 # system emulator name  # system emulator name
 ifdef CONFIG_SOFTMMU  ifdef CONFIG_SOFTMMU
Line 70  BASE_LDFLAGS+=-static Line 97  BASE_LDFLAGS+=-static
 endif  endif
   
 # We require -O2 to avoid the stack setup prologue in EXIT_TB  # We require -O2 to avoid the stack setup prologue in EXIT_TB
 OP_CFLAGS = -Wall -O2 -g -fno-strict-aliasing  OP_CFLAGS := -Wall -O2 -g -fno-strict-aliasing
   
   # cc-option
   # Usage: OP_CFLAGS+=$(call cc-option, -falign-functions=0, -malign-functions=0)
   
   cc-option = $(shell if $(CC) $(OP_CFLAGS) $(1) -S -o /dev/null -xc /dev/null \
                 > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
   
   OP_CFLAGS+=$(call cc-option, -fno-reorder-blocks, "")
   OP_CFLAGS+=$(call cc-option, -fno-gcse, "")
   OP_CFLAGS+=$(call cc-option, -fno-tree-ch, "")
   OP_CFLAGS+=$(call cc-option, -fno-optimize-sibling-calls, "")
   OP_CFLAGS+=$(call cc-option, -fno-crossjumping, "")
   OP_CFLAGS+=$(call cc-option, -fno-align-labels, "")
   OP_CFLAGS+=$(call cc-option, -fno-align-jumps, "")
   OP_CFLAGS+=$(call cc-option, -fno-align-functions, $(call cc-option, -malign-functions=0, ""))
   OP_CFLAGS+=$(call cc-option, -fno-section-anchors, "")
   
 ifeq ($(ARCH),i386)  ifeq ($(ARCH),i386)
 HELPER_CFLAGS+=-fomit-frame-pointer  HELPER_CFLAGS+=-fomit-frame-pointer
 OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer  OP_CFLAGS+=-mpreferred-stack-boundary=2 -fomit-frame-pointer
 ifeq ($(HAVE_GCC3_OPTIONS),yes)  
 OP_CFLAGS+= -falign-functions=0 -fno-gcse  
 else  
 OP_CFLAGS+= -malign-functions=0  
 endif  
 ifdef TARGET_GPROF  ifdef TARGET_GPROF
 USE_I386_LD=y  USE_I386_LD=y
 endif  endif
Line 99  endif Line 137  endif
 endif  endif
   
 ifeq ($(ARCH),x86_64)  ifeq ($(ARCH),x86_64)
 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld    ifneq ($(CONFIG_SOLARIS),yes)
       BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
     endif
 endif  endif
   
 ifeq ($(ARCH),ppc)  ifeq ($(ARCH),ppc)
 CPPFLAGS+= -D__powerpc__  CPPFLAGS+= -D__powerpc__
 ifdef CONFIG_LINUX_USER  
 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld  BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
 endif  endif
 endif  
   
 ifeq ($(ARCH),s390)  ifeq ($(ARCH),s390)
 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld  BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
 endif  endif
   
 ifeq ($(ARCH),sparc)  ifeq ($(ARCH),sparc)
 ifeq ($(CONFIG_SOLARIS),yes)    BASE_CFLAGS+=-ffixed-g2 -ffixed-g3
 BASE_CFLAGS+=-mcpu=ultrasparc -m32 -ffixed-g2 -ffixed-g3    OP_CFLAGS+=-fno-delayed-branch -ffixed-i0
 BASE_LDFLAGS+=-m32    ifeq ($(CONFIG_SOLARIS),yes)
 OP_CFLAGS+=-fno-delayed-branch -fno-omit-frame-pointer -ffixed-i0      OP_CFLAGS+=-fno-omit-frame-pointer
 else    else
 BASE_CFLAGS+=-mcpu=ultrasparc -m32 -ffixed-g1 -ffixed-g2 -ffixed-g3 -ffixed-g6      BASE_CFLAGS+=-ffixed-g1 -ffixed-g6
 BASE_LDFLAGS+=-m32      HELPER_CFLAGS=$(CFLAGS) -ffixed-i0
 OP_CFLAGS+=-fno-delayed-branch -ffixed-i0      # -static is used to avoid g1/g3 usage by the dynamic linker
 HELPER_CFLAGS=$(CFLAGS) -ffixed-i0 -mflat      BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -static
 # -static is used to avoid g1/g3 usage by the dynamic linker    endif
 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -static  
 endif  
 endif  endif
   
 ifeq ($(ARCH),sparc64)  ifeq ($(ARCH),sparc64)
 BASE_CFLAGS+=-mcpu=ultrasparc -m64 -ffixed-g1 -ffixed-g4 -ffixed-g5 -ffixed-g7    BASE_CFLAGS+=-ffixed-g1 -ffixed-g4 -ffixed-g5 -ffixed-g7
 BASE_LDFLAGS+=-m64    OP_CFLAGS+=-mcpu=ultrasparc -m64 -fno-delayed-branch -ffixed-i0
 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld    ifneq ($(CONFIG_SOLARIS),yes)
 OP_CFLAGS+=-mcpu=ultrasparc -m64 -ffixed-g1 -ffixed-g4 -ffixed-g5 -ffixed-g7 -fno-delayed-branch -ffixed-i0      BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
       OP_CFLAGS+=-ffixed-g1 -ffixed-g4 -ffixed-g5 -ffixed-g7
     endif
 endif  endif
   
 ifeq ($(ARCH),alpha)  ifeq ($(ARCH),alpha)
Line 160  BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH) Line 198  BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)
 endif  endif
   
 ifeq ($(ARCH),mips)  ifeq ($(ARCH),mips)
   OP_CFLAGS+=-mabi=32 -G0 -fno-PIC -mno-abicalls -fomit-frame-pointer -fno-delayed-branch -Wa,-O0
   ifeq ($(WORDS_BIGENDIAN),yes)
 BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld  BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
   else
   BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld
   endif
 endif  endif
   
 ifeq ($(HAVE_GCC3_OPTIONS),yes)  ifeq ($(ARCH),mips64)
 # very important to generate a return at the end of every operation  OP_CFLAGS+=-mabi=n32 -G0 -fno-PIC -mno-abicalls -fomit-frame-pointer -fno-delayed-branch -Wa,-O0
 OP_CFLAGS+=-fno-reorder-blocks -fno-optimize-sibling-calls  ifeq ($(WORDS_BIGENDIAN),yes)
   BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
   else
   BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld
   endif
 endif  endif
   
 ifeq ($(CONFIG_DARWIN),yes)  ifeq ($(CONFIG_DARWIN),yes)
Line 177  ifdef CONFIG_DARWIN_USER Line 224  ifdef CONFIG_DARWIN_USER
 BASE_LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000  BASE_LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000
 endif  endif
   
 OP_CFLAGS+=$(OS_CFLAGS)  BASE_CFLAGS+=$(OS_CFLAGS) $(ARCH_CFLAGS)
   BASE_LDFLAGS+=$(OS_LDFLAGS) $(ARCH_LDFLAGS)
   OP_CFLAGS+=$(OS_CFLAGS) $(ARCH_CFLAGS)
   OP_LDFLAGS+=$(OS_LDFLAGS) $(ARCH_LDFLAGS)
   
 #########################################################  #########################################################
   
Line 191  LIBS+=-lwinmm -lws2_32 -liphlpapi Line 241  LIBS+=-lwinmm -lws2_32 -liphlpapi
 endif  endif
 ifdef CONFIG_SOLARIS  ifdef CONFIG_SOLARIS
 LIBS+=-lsocket -lnsl -lresolv  LIBS+=-lsocket -lnsl -lresolv
   ifdef NEEDS_LIBSUNMATH
   LIBS+=-lsunmath
   LDFLAGS+=-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib
   OP_CFLAGS+=-I/opt/SUNWspro/prod/include/cc
   BASE_CFLAGS+=-I/opt/SUNWspro/prod/include/cc
   endif
 endif  endif
   
 # profiling code  # profiling code
Line 200  main.o: BASE_CFLAGS+=-p Line 256  main.o: BASE_CFLAGS+=-p
 endif  endif
   
 ifdef CONFIG_LINUX_USER  ifdef CONFIG_LINUX_USER
 OBJS= main.o syscall.o mmap.o signal.o path.o osdep.o thunk.o \  OBJS= main.o syscall.o strace.o mmap.o signal.o path.o osdep.o thunk.o \
       elfload.o linuxload.o        elfload.o linuxload.o uaccess.o
   LIBS+= $(AIOLIBS)
 ifdef TARGET_HAS_BFLT  ifdef TARGET_HAS_BFLT
 OBJS+= flatload.o  OBJS+= flatload.o
 endif  endif
   ifdef TARGET_HAS_ELFLOAD32
   OBJS+= elfload32.o
   elfload32.o: elfload.c
   endif
   
 ifeq ($(TARGET_ARCH), i386)  ifeq ($(TARGET_ARCH), i386)
 OBJS+= vm86.o  OBJS+= vm86.o
Line 228  OBJS+= libqemu.a Line 289  OBJS+= libqemu.a
   
 # cpu emulator library  # cpu emulator library
 LIBOBJS=exec.o kqemu.o translate-op.o translate-all.o cpu-exec.o\  LIBOBJS=exec.o kqemu.o translate-op.o translate-all.o cpu-exec.o\
         translate.o op.o           translate.o op.o host-utils.o
 ifdef CONFIG_SOFTFLOAT  ifdef CONFIG_SOFTFLOAT
 LIBOBJS+=fpu/softfloat.o  LIBOBJS+=fpu/softfloat.o
 else  else
Line 238  CPPFLAGS+=-I$(SRC_PATH)/fpu Line 299  CPPFLAGS+=-I$(SRC_PATH)/fpu
   
 ifeq ($(TARGET_ARCH), i386)  ifeq ($(TARGET_ARCH), i386)
 LIBOBJS+=helper.o helper2.o  LIBOBJS+=helper.o helper2.o
 ifeq ($(ARCH), i386)  
 LIBOBJS+=translate-copy.o  
 endif  
 endif  endif
   
 ifeq ($(TARGET_ARCH), x86_64)  ifeq ($(TARGET_ARCH), x86_64)
Line 251  ifeq ($(TARGET_BASE_ARCH), ppc) Line 309  ifeq ($(TARGET_BASE_ARCH), ppc)
 LIBOBJS+= op_helper.o helper.o  LIBOBJS+= op_helper.o helper.o
 endif  endif
   
 ifeq ($(TARGET_ARCH), mips)  ifeq ($(TARGET_BASE_ARCH), mips)
 LIBOBJS+= op_helper.o helper.o  LIBOBJS+= op_helper.o helper.o
 endif  endif
   
Line 268  LIBOBJS+= op_helper.o helper.o Line 326  LIBOBJS+= op_helper.o helper.o
 endif  endif
   
 ifeq ($(TARGET_BASE_ARCH), m68k)  ifeq ($(TARGET_BASE_ARCH), m68k)
 LIBOBJS+= helper.o  LIBOBJS+= op_helper.o helper.o
   endif
   
   ifeq ($(TARGET_BASE_ARCH), alpha)
   LIBOBJS+= op_helper.o helper.o alpha_palcode.o
   endif
   
   ifeq ($(TARGET_BASE_ARCH), cris)
   LIBOBJS+= op_helper.o helper.o
   LIBOBJS+= cris-dis.o
   
   ifndef CONFIG_USER_ONLY
   LIBOBJS+= mmu.o
   endif
 endif  endif
   
 # NOTE: the disassembler code is only needed for debugging  # NOTE: the disassembler code is only needed for debugging
 LIBOBJS+=disas.o   LIBOBJS+=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
Line 288  endif Line 359  endif
 ifeq ($(findstring ppc, $(TARGET_BASE_ARCH) $(ARCH)),ppc)  ifeq ($(findstring ppc, $(TARGET_BASE_ARCH) $(ARCH)),ppc)
 LIBOBJS+=ppc-dis.o  LIBOBJS+=ppc-dis.o
 endif  endif
 ifeq ($(findstring mips, $(TARGET_ARCH) $(ARCH)),mips)  ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips)
 LIBOBJS+=mips-dis.o  LIBOBJS+=mips-dis.o
 endif  endif
 ifeq ($(findstring sparc, $(TARGET_BASE_ARCH) $(ARCH)),sparc)  ifeq ($(findstring sparc, $(TARGET_BASE_ARCH) $(ARCH)),sparc)
Line 303  endif Line 374  endif
 ifeq ($(findstring sh4, $(TARGET_ARCH) $(ARCH)),sh4)  ifeq ($(findstring sh4, $(TARGET_ARCH) $(ARCH)),sh4)
 LIBOBJS+=sh4-dis.o  LIBOBJS+=sh4-dis.o
 endif  endif
   ifeq ($(findstring s390, $(TARGET_ARCH) $(ARCH)),s390)
   LIBOBJS+=s390-dis.o
   endif
   
 ifdef CONFIG_GDBSTUB  ifdef CONFIG_GDBSTUB
 OBJS+=gdbstub.o  OBJS+=gdbstub.o
Line 319  ifeq ($(ARCH),alpha) Line 393  ifeq ($(ARCH),alpha)
 endif  endif
   
 # must use static linking to avoid leaving stuff in virtual address space  # must use static linking to avoid leaving stuff in virtual address space
 VL_OBJS=vl.o osdep.o readline.o monitor.o pci.o console.o loader.o isa_mmio.o  VL_OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o
 VL_OBJS+=cutils.o  # XXX: suppress QEMU_TOOL tests
 VL_OBJS+=block.o block-raw.o  
 VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o block-dmg.o block-bochs.o block-vpc.o block-vvfat.o block-qcow2.o  
 ifdef CONFIG_WIN32  ifdef CONFIG_WIN32
 VL_OBJS+=tap-win32.o  VL_OBJS+=block-raw-win32.o
   else
   VL_OBJS+=block-raw-posix.o
 endif  endif
   
 SOUND_HW = sb16.o es1370.o  
 AUDIODRV = audio.o noaudio.o wavaudio.o  
 ifdef CONFIG_SDL  
 AUDIODRV += sdlaudio.o  
 endif  
 ifdef CONFIG_OSS  
 AUDIODRV += ossaudio.o  
 endif  
 ifdef CONFIG_COREAUDIO  
 AUDIODRV += coreaudio.o  
 endif  
 ifdef CONFIG_ALSA  ifdef CONFIG_ALSA
 AUDIODRV += alsaaudio.o  
 LIBS += -lasound  LIBS += -lasound
 endif  endif
 ifdef CONFIG_DSOUND  ifdef CONFIG_DSOUND
 AUDIODRV += dsoundaudio.o  
 LIBS += -lole32 -ldxguid  LIBS += -lole32 -ldxguid
 endif  endif
 ifdef CONFIG_FMOD  ifdef CONFIG_FMOD
 AUDIODRV += fmodaudio.o  
 audio.o fmodaudio.o: CPPFLAGS := -I$(CONFIG_FMOD_INC) $(CPPFLAGS)  
 LIBS += $(CONFIG_FMOD_LIB)  LIBS += $(CONFIG_FMOD_LIB)
 endif  endif
   
   SOUND_HW = sb16.o es1370.o
 ifdef CONFIG_ADLIB  ifdef CONFIG_ADLIB
 SOUND_HW += fmopl.o adlib.o  SOUND_HW += fmopl.o adlib.o
 endif  endif
 AUDIODRV+= wavcapture.o  
   ifdef CONFIG_VNC_TLS
   CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
   LIBS += $(CONFIG_VNC_TLS_LIBS)
   endif
   
 # SCSI layer  # SCSI layer
 VL_OBJS+= scsi-disk.o cdrom.o lsi53c895a.o  VL_OBJS+= lsi53c895a.o
   
 # USB layer  # USB layer
 VL_OBJS+= usb.o usb-hub.o usb-linux.o usb-hid.o usb-ohci.o usb-msd.o  VL_OBJS+= usb-ohci.o
   
   # EEPROM emulation
   VL_OBJS += eeprom93xx.o
   
 # PCI network cards  # PCI network cards
 VL_OBJS+= ne2000.o rtl8139.o pcnet.o  VL_OBJS += eepro100.o
   VL_OBJS += ne2000.o
   VL_OBJS += pcnet.o
   VL_OBJS += rtl8139.o
   
 ifeq ($(TARGET_BASE_ARCH), i386)  ifeq ($(TARGET_BASE_ARCH), i386)
 # Hardware support  # Hardware support
 VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)  VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o
 VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o  VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
 VL_OBJS+= cirrus_vga.o mixeng.o apic.o parallel.o acpi.o piix_pci.o  VL_OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
 VL_OBJS+= usb-uhci.o smbus_eeprom.o  VL_OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o
 CPPFLAGS += -DHAS_AUDIO  CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif  endif
 ifeq ($(TARGET_BASE_ARCH), ppc)  ifeq ($(TARGET_BASE_ARCH), ppc)
 VL_OBJS+= ppc.o ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)  CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 VL_OBJS+= mc146818rtc.o serial.o i8259.o i8254.o fdc.o m48t59.o  # shared objects
 VL_OBJS+= ppc_prep.o ppc_chrp.o cuda.o adb.o openpic.o heathrow_pic.o mixeng.o  VL_OBJS+= ppc.o ide.o vga.o $(SOUND_HW) dma.o openpic.o
 VL_OBJS+= grackle_pci.o prep_pci.o unin_pci.o  # PREP target
   VL_OBJS+= pckbd.o ps2.o serial.o i8259.o i8254.o fdc.o m48t59.o mc146818rtc.o
   VL_OBJS+= prep_pci.o ppc_prep.o
   # Mac shared devices
   VL_OBJS+= macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o
   # OldWorld PowerMac
   VL_OBJS+= heathrow_pic.o grackle_pci.o ppc_oldworld.o
   # NewWorld PowerMac
   VL_OBJS+= unin_pci.o ppc_chrp.o
   # PowerPC 4xx boards
   VL_OBJS+= pflash_cfi02.o ppc4xx_devs.o ppc405_uc.o ppc405_boards.o
   endif
   ifeq ($(TARGET_BASE_ARCH), mips)
   VL_OBJS+= mips_r4k.o mips_malta.o mips_pica61.o mips_mipssim.o
   VL_OBJS+= mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o
   VL_OBJS+= jazz_led.o
   VL_OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
   VL_OBJS+= piix_pci.o parallel.o cirrus_vga.o $(SOUND_HW)
   VL_OBJS+= mipsnet.o
   VL_OBJS+= pflash_cfi01.o
 CPPFLAGS += -DHAS_AUDIO  CPPFLAGS += -DHAS_AUDIO
 endif  endif
 ifeq ($(TARGET_ARCH), mips)  ifeq ($(TARGET_BASE_ARCH), cris)
 VL_OBJS+= mips_r4k.o mips_malta.o mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o  VL_OBJS+= etraxfs.o
 VL_OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o  VL_OBJS+= ptimer.o
 VL_OBJS+= piix_pci.o parallel.o mixeng.o cirrus_vga.o $(SOUND_HW) $(AUDIODRV)  VL_OBJS+= etraxfs_timer.o
 DEFINES += -DHAS_AUDIO  VL_OBJS+= etraxfs_ser.o
 endif  endif
 ifeq ($(TARGET_BASE_ARCH), sparc)  ifeq ($(TARGET_BASE_ARCH), sparc)
 ifeq ($(TARGET_ARCH), sparc64)  ifeq ($(TARGET_ARCH), sparc64)
 VL_OBJS+= sun4u.o ide.o pckbd.o ps2.o vga.o apb_pci.o  VL_OBJS+= sun4u.o ide.o pckbd.o ps2.o vga.o apb_pci.o
 VL_OBJS+= fdc.o mc146818rtc.o serial.o m48t59.o  VL_OBJS+= fdc.o mc146818rtc.o serial.o m48t59.o
 VL_OBJS+= cirrus_vga.o parallel.o  VL_OBJS+= cirrus_vga.o parallel.o ptimer.o
 else  else
 VL_OBJS+= sun4m.o tcx.o pcnet.o iommu.o m48t59.o slavio_intctl.o  VL_OBJS+= sun4m.o tcx.o pcnet.o iommu.o m48t59.o slavio_intctl.o
 VL_OBJS+= slavio_timer.o slavio_serial.o slavio_misc.o fdc.o esp.o sparc32_dma.o  VL_OBJS+= slavio_timer.o slavio_serial.o slavio_misc.o fdc.o esp.o sparc32_dma.o
 VL_OBJS+= cs4231.o  VL_OBJS+= cs4231.o ptimer.o eccmemctl.o sbi.o sun4c_intctl.o
 endif  endif
 endif  endif
 ifeq ($(TARGET_BASE_ARCH), arm)  ifeq ($(TARGET_BASE_ARCH), arm)
 VL_OBJS+= integratorcp.o versatilepb.o ps2.o smc91c111.o arm_pic.o arm_timer.o  VL_OBJS+= integratorcp.o versatilepb.o ps2.o smc91c111.o arm_pic.o arm_timer.o
 VL_OBJS+= arm_boot.o pl011.o pl050.o pl080.o pl110.o pl190.o  VL_OBJS+= arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o
 VL_OBJS+= versatile_pci.o  VL_OBJS+= versatile_pci.o ptimer.o
 VL_OBJS+= arm_gic.o realview.o arm_sysctl.o  VL_OBJS+= realview_gic.o realview.o arm_sysctl.o mpcore.o
   VL_OBJS+= armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o
   VL_OBJS+= pl061.o
 VL_OBJS+= arm-semi.o  VL_OBJS+= arm-semi.o
   VL_OBJS+= pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
   VL_OBJS+= pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
   VL_OBJS+= pflash_cfi01.o gumstix.o
   VL_OBJS+= spitz.o ide.o serial.o nand.o ecc.o
   VL_OBJS+= omap.o omap_lcdc.o omap1_clk.o omap_mmc.o omap_i2c.o
   VL_OBJS+= palm.o tsc210x.o
   VL_OBJS+= mst_fpga.o mainstone.o
   CPPFLAGS += -DHAS_AUDIO
 endif  endif
 ifeq ($(TARGET_BASE_ARCH), sh4)  ifeq ($(TARGET_BASE_ARCH), sh4)
 VL_OBJS+= shix.o sh7750.o sh7750_regnames.o tc58128.o  VL_OBJS+= shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o
   VL_OBJS+= sh_timer.o ptimer.o sh_serial.o sh_intc.o
 endif  endif
 ifdef CONFIG_GDBSTUB  ifeq ($(TARGET_BASE_ARCH), m68k)
 VL_OBJS+=gdbstub.o   VL_OBJS+= an5206.o mcf5206.o ptimer.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o
   VL_OBJS+= m68k-semi.o dummy_m68k.o
 endif  endif
 ifdef CONFIG_SDL  ifdef CONFIG_GDBSTUB
 VL_OBJS+=sdl.o x_keymap.o  VL_OBJS+=gdbstub.o
 endif  endif
 VL_OBJS+=vnc.o  
 ifdef CONFIG_COCOA  ifdef CONFIG_COCOA
 VL_OBJS+=cocoa.o  
 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
 COCOA_LIBS+=-framework CoreAudio  COCOA_LIBS+=-framework CoreAudio
Line 423  endif Line 523  endif
 endif  endif
 ifdef CONFIG_SLIRP  ifdef CONFIG_SLIRP
 CPPFLAGS+=-I$(SRC_PATH)/slirp  CPPFLAGS+=-I$(SRC_PATH)/slirp
 SLIRP_OBJS=cksum.o if.o ip_icmp.o ip_input.o ip_output.o \  
 slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o \  
 tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o  
 VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS))  
 endif  endif
   
 VL_LDFLAGS=  VL_LDFLAGS=$(VL_OS_LDFLAGS)
   VL_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
 VL_LDFLAGS+=-static  VL_LDFLAGS+=-static
 endif  endif
 ifndef CONFIG_SOFTMMU  ifndef CONFIG_SOFTMMU
 VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld   VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.ld
 endif  endif
 ifndef CONFIG_DARWIN  ifndef CONFIG_DARWIN
 ifndef CONFIG_WIN32  ifndef CONFIG_WIN32
 ifndef CONFIG_SOLARIS  ifndef CONFIG_SOLARIS
 VL_LIBS=-lutil -lrt  VL_LIBS+=-lutil
 endif  endif
 endif  endif
 endif  endif
Line 454  VL_LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/i Line 551  VL_LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/i
 endif  endif
   
 ifeq ($(ARCH),sparc64)  ifeq ($(ARCH),sparc64)
 VL_LDFLAGS+=-m64    VL_LDFLAGS+=-m64
 VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc64.ld    ifneq ($(CONFIG_SOLARIS),yes)
       VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
     endif
   endif
   
   ifeq ($(ARCH),x86_64)
     VL_LDFLAGS+=-m64
     ifneq ($(CONFIG_SOLARIS),yes)
       VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld
     endif
 endif  endif
   
 ifdef CONFIG_WIN32  ifdef CONFIG_WIN32
 SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole  SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
 endif  endif
   
 $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a  $(QEMU_SYSTEM): $(VL_OBJS) ../libqemu_common.a libqemu.a
         $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS)          $(CC) $(VL_LDFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS)
   
 cocoa.o: cocoa.m  
         $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<  
   
 sdl.o: sdl.c keymaps.c sdl_keysym.h  
         $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) $(BASE_CFLAGS) -c -o $@ $<  
   
 vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h  
         $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<  
   
 sdlaudio.o: sdlaudio.c  
         $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) $(BASE_CFLAGS) -c -o $@ $<  
   
 depend: $(SRCS)  depend: $(SRCS)
         $(CC) -MM $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $^ 1>.depend          $(CC) -MM $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $^ 1>.depend
Line 483  depend: $(SRCS) Line 577  depend: $(SRCS)
 vldepend: $(VL_OBJS:.o=.c)  vldepend: $(VL_OBJS:.o=.c)
         $(CC) -MM $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $^ 1>.depend          $(CC) -MM $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $^ 1>.depend
   
 # libqemu   # libqemu
   
 libqemu.a: $(LIBOBJS)  libqemu.a: $(LIBOBJS)
         rm -f $@          rm -f $@
Line 526  cpu-exec.o: cpu-exec.c Line 620  cpu-exec.o: cpu-exec.c
 signal.o: signal.c  signal.o: signal.c
         $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<          $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<
   
 ifeq ($(TARGET_BASE_ARCH), i386)  
 op.o: op.c opreg_template.h ops_template.h ops_template_mem.h ops_mem.h ops_sse.h  
 endif  
   
 ifeq ($(TARGET_ARCH), arm)  
 op.o: op.c op_template.h  
 pl110.o: pl110_template.h  
 endif  
   
 ifeq ($(TARGET_BASE_ARCH), sparc)  
 op.o: op.c op_template.h op_mem.h fop_template.h fbranch_template.h  
 magic_load.o: elf_op.h  
 endif  
   
 ifeq ($(TARGET_BASE_ARCH), ppc)  
 op.o: op.c op_template.h op_mem.h  
 op_helper.o: op_helper_mem.h  
 translate.o: translate.c translate_init.c  
 endif  
   
 ifeq ($(TARGET_ARCH), mips)  
 op.o: op.c op_template.c fop_template.c op_mem.c  
 op_helper.o: op_helper_mem.c  
 endif  
   
 loader.o: loader.c elf_ops.h  
   
 ifeq ($(TARGET_ARCH), sh4)  
 op.o: op.c op_mem.c cpu.h  
 op_helper.o: op_helper.c exec.h cpu.h  
 helper.o: helper.c exec.h cpu.h  
 sh7750.o: sh7750.c sh7750_regs.h sh7750_regnames.h cpu.h  
 shix.o: shix.c sh7750_regs.h sh7750_regnames.h  
 sh7750_regnames.o: sh7750_regnames.c sh7750_regnames.h sh7750_regs.h  
 tc58128.o: tc58128.c  
 endif  
   
 $(OBJS) $(LIBOBJS) $(VL_OBJS): config.h ../config-host.h  
   
 %.o: %.c  %.o: %.c
         $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<          $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $<
   
Line 572  $(OBJS) $(LIBOBJS) $(VL_OBJS): config.h  Line 627  $(OBJS) $(LIBOBJS) $(VL_OBJS): config.h 
         $(CC) $(CPPFLAGS) -c -o $@ $<          $(CC) $(CPPFLAGS) -c -o $@ $<
   
 clean:  clean:
         rm -f *.o  *.a *~ $(PROGS) gen-op.h opc.h op.h nwfpe/*.o slirp/*.o fpu/*.o          rm -f *.o *.a *~ $(PROGS) gen-op.h opc.h op.h nwfpe/*.o fpu/*.o
           rm -f *.d */*.d
   
 install: all   install: all
 ifneq ($(PROGS),)  ifneq ($(PROGS),)
         $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"          $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
 endif  endif
Line 588  audio.o sdlaudio.o dsoundaudio.o ossaudi Line 644  audio.o sdlaudio.o dsoundaudio.o ossaudi
 fmodaudio.o alsaaudio.o mixeng.o sb16.o es1370.o gus.o adlib.o: \  fmodaudio.o alsaaudio.o mixeng.o sb16.o es1370.o gus.o adlib.o: \
 CFLAGS := $(CFLAGS) -Wall -Werror -W -Wsign-compare  CFLAGS := $(CFLAGS) -Wall -Werror -W -Wsign-compare
 endif  endif
   
   # Include automatically generated dependency files
   -include $(wildcard *.d */*.d)

Removed from v.1.1.1.5  
changed lines
  Added in v.1.1.1.6


unix.superglobalmegacorp.com