Diff for /qemu/Makefile.target between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2018/04/24 16:38:41 version 1.1.1.3, 2018/04/24 16:40:51
Line 12  TARGET_BASE_ARCH:=sparc Line 12  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:$(SRC_PATH)/audio
 DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH)  DEFINES=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH)
 ifdef CONFIG_USER_ONLY  ifdef CONFIG_USER_ONLY
 VPATH+=:$(SRC_PATH)/linux-user  VPATH+=:$(SRC_PATH)/linux-user
 DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)  DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
Line 24  LIBS= Line 24  LIBS=
 HELPER_CFLAGS=$(CFLAGS)  HELPER_CFLAGS=$(CFLAGS)
 DYNGEN=../dyngen$(EXESUF)  DYNGEN=../dyngen$(EXESUF)
 # user emulator name  # user emulator name
   TARGET_ARCH2=$(TARGET_ARCH)
 ifeq ($(TARGET_ARCH),arm)  ifeq ($(TARGET_ARCH),arm)
   ifeq ($(TARGET_WORDS_BIGENDIAN),yes)    ifeq ($(TARGET_WORDS_BIGENDIAN),yes)
     QEMU_USER=qemu-armeb      TARGET_ARCH2=armeb
   else  
     QEMU_USER=qemu-arm  
   endif    endif
 else  endif
 ifeq ($(TARGET_ARCH),mips)  ifeq ($(TARGET_ARCH),mips)
   ifeq ($(TARGET_WORDS_BIGENDIAN),yes)    ifneq ($(TARGET_WORDS_BIGENDIAN),yes)
     QEMU_USER=qemu-mips      TARGET_ARCH2=mipsel
   else  
     QEMU_USER=qemu-mipsel  
   endif    endif
 else  
   QEMU_USER=qemu-$(TARGET_ARCH)  
 endif  
 endif  endif
   QEMU_USER=qemu-$(TARGET_ARCH2)
 # system emulator name  # system emulator name
 ifdef CONFIG_SOFTMMU  ifdef CONFIG_SOFTMMU
 ifeq ($(TARGET_ARCH), i386)  ifeq ($(TARGET_ARCH), i386)
 QEMU_SYSTEM=qemu$(EXESUF)  QEMU_SYSTEM=qemu$(EXESUF)
 else  else
 QEMU_SYSTEM=qemu-system-$(TARGET_ARCH)$(EXESUF)  QEMU_SYSTEM=qemu-system-$(TARGET_ARCH2)$(EXESUF)
 endif  endif
 else  else
 QEMU_SYSTEM=qemu-fast  QEMU_SYSTEM=qemu-fast
Line 166  endif Line 161  endif
 ifdef CONFIG_WIN32  ifdef CONFIG_WIN32
 LIBS+=-lwinmm -lws2_32 -liphlpapi  LIBS+=-lwinmm -lws2_32 -liphlpapi
 endif  endif
   ifdef CONFIG_SOLARIS
   LIBS+=-lsocket -lnsl -lresolv
   endif
   
 # profiling code  # profiling code
 ifdef TARGET_GPROF  ifdef TARGET_GPROF
Line 222  ifeq ($(TARGET_BASE_ARCH), arm) Line 220  ifeq ($(TARGET_BASE_ARCH), arm)
 LIBOBJS+= op_helper.o helper.o  LIBOBJS+= op_helper.o helper.o
 endif  endif
   
   ifeq ($(TARGET_BASE_ARCH), sh4)
   LIBOBJS+= op_helper.o helper.o
   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)
Line 251  endif Line 253  endif
 ifeq ($(findstring m68k, $(TARGET_ARCH) $(ARCH)),m68k)  ifeq ($(findstring m68k, $(TARGET_ARCH) $(ARCH)),m68k)
 LIBOBJS+=m68k-dis.o  LIBOBJS+=m68k-dis.o
 endif  endif
   ifeq ($(findstring sh4, $(TARGET_ARCH) $(ARCH)),sh4)
 ifeq ($(ARCH),ia64)  LIBOBJS+=sh4-dis.o
 OBJS += ia64-syscall.o  
 endif  endif
   
 ifdef CONFIG_GDBSTUB  ifdef CONFIG_GDBSTUB
 OBJS+=gdbstub.o  OBJS+=gdbstub.o
 endif  endif
Line 270  ifeq ($(ARCH),alpha) Line 272  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 block.o readline.o monitor.o pci.o console.o  VL_OBJS=vl.o osdep.o block.o readline.o monitor.o pci.o console.o loader.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  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
   ifdef CONFIG_WIN32
   VL_OBJS+=tap-win32.o
   endif
   
 SOUND_HW = sb16.o es1370.o  SOUND_HW = sb16.o es1370.o
 AUDIODRV = audio.o noaudio.o wavaudio.o  AUDIODRV = audio.o noaudio.o wavaudio.o
Line 302  SOUND_HW += fmopl.o adlib.o Line 307  SOUND_HW += fmopl.o adlib.o
 endif  endif
   
 # USB layer  # USB layer
 VL_OBJS+= usb.o usb-uhci.o usb-linux.o usb-hid.o  VL_OBJS+= usb.o usb-hub.o usb-uhci.o usb-linux.o usb-hid.o
   
   # PCI network cards
   VL_OBJS+= ne2000.o rtl8139.o
   
 ifeq ($(TARGET_BASE_ARCH), i386)  ifeq ($(TARGET_BASE_ARCH), i386)
 # Hardware support  # Hardware support
 VL_OBJS+= ide.o ne2000.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 $(AUDIODRV)
 VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.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  VL_OBJS+= cirrus_vga.o mixeng.o apic.o parallel.o
 DEFINES += -DHAS_AUDIO  DEFINES += -DHAS_AUDIO
 endif  endif
 ifeq ($(TARGET_BASE_ARCH), ppc)  ifeq ($(TARGET_BASE_ARCH), ppc)
 VL_OBJS+= ppc.o ide.o ne2000.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)  VL_OBJS+= ppc.o ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
 VL_OBJS+= mc146818rtc.o serial.o i8259.o i8254.o fdc.o m48t59.o  VL_OBJS+= mc146818rtc.o serial.o i8259.o i8254.o fdc.o m48t59.o
 VL_OBJS+= ppc_prep.o ppc_chrp.o cuda.o adb.o openpic.o heathrow_pic.o mixeng.o  VL_OBJS+= ppc_prep.o ppc_chrp.o cuda.o adb.o openpic.o heathrow_pic.o mixeng.o
 DEFINES += -DHAS_AUDIO  DEFINES += -DHAS_AUDIO
 endif  endif
 ifeq ($(TARGET_ARCH), mips)  ifeq ($(TARGET_ARCH), mips)
 VL_OBJS+= mips_r4k.o dma.o vga.o serial.o ne2000.o i8254.o i8259.o  VL_OBJS+= mips_r4k.o dma.o vga.o serial.o i8254.o i8259.o
 #VL_OBJS+= #ide.o pckbd.o fdc.o m48t59.o  #VL_OBJS+= #ide.o pckbd.o fdc.o m48t59.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 ne2000.o pckbd.o ps2.o vga.o  VL_OBJS+= sun4u.o ide.o pckbd.o ps2.o vga.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
 VL_OBJS+= magic-load.o  
 else  else
 VL_OBJS+= sun4m.o tcx.o lance.o iommu.o m48t59.o magic-load.o slavio_intctl.o  VL_OBJS+= sun4m.o tcx.o lance.o iommu.o m48t59.o slavio_intctl.o
 VL_OBJS+= slavio_timer.o slavio_serial.o slavio_misc.o fdc.o esp.o  VL_OBJS+= slavio_timer.o slavio_serial.o slavio_misc.o fdc.o esp.o
 endif  endif
 endif  endif
 ifeq ($(TARGET_BASE_ARCH), arm)  ifeq ($(TARGET_BASE_ARCH), arm)
 VL_OBJS+= integratorcp.o ps2.o smc91c111.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
   endif
   ifeq ($(TARGET_BASE_ARCH), sh4)
   VL_OBJS+= shix.o sh7750.o sh7750_regnames.o tc58128.o
 endif  endif
 ifdef CONFIG_GDBSTUB  ifdef CONFIG_GDBSTUB
 VL_OBJS+=gdbstub.o   VL_OBJS+=gdbstub.o 
Line 341  endif Line 352  endif
 ifdef CONFIG_SDL  ifdef CONFIG_SDL
 VL_OBJS+=sdl.o  VL_OBJS+=sdl.o
 endif  endif
   VL_OBJS+=vnc.o
 ifdef CONFIG_COCOA  ifdef CONFIG_COCOA
 VL_OBJS+=cocoa.o  VL_OBJS+=cocoa.o
 COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit  COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit
Line 366  VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.l Line 378  VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/i386-vl.l
 endif  endif
 ifndef CONFIG_DARWIN  ifndef CONFIG_DARWIN
 ifndef CONFIG_WIN32  ifndef CONFIG_WIN32
   ifndef CONFIG_SOLARIS
 VL_LIBS=-lutil  VL_LIBS=-lutil
 endif  endif
 endif  endif
   endif
 ifdef TARGET_GPROF  ifdef TARGET_GPROF
 vl.o: CFLAGS+=-p  vl.o: CFLAGS+=-p
 VL_LDFLAGS+=-p  VL_LDFLAGS+=-p
Line 391  cocoa.o: cocoa.m Line 405  cocoa.o: cocoa.m
 sdl.o: sdl.c keymaps.c sdl_keysym.h  sdl.o: sdl.c keymaps.c sdl_keysym.h
         $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<          $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
   
   vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h
           $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
   
 sdlaudio.o: sdlaudio.c  sdlaudio.o: sdlaudio.c
         $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<          $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<
   
Line 433  endif Line 450  endif
   
 ifeq ($(TARGET_ARCH), arm)  ifeq ($(TARGET_ARCH), arm)
 op.o: op.c op_template.h  op.o: op.c op_template.h
   pl110.o: pl110_template.h
 endif  endif
   
 ifeq ($(TARGET_BASE_ARCH), sparc)  ifeq ($(TARGET_BASE_ARCH), sparc)
Line 451  op.o: op.c op_template.c op_mem.c Line 469  op.o: op.c op_template.c op_mem.c
 op_helper.o: op_helper_mem.c  op_helper.o: op_helper_mem.c
 endif  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
   
 %.o: %.c  %.o: %.c
         $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<          $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
   
Line 462  clean: Line 492  clean:
   
 install: all   install: all 
 ifneq ($(PROGS),)  ifneq ($(PROGS),)
         install -m 755 -s $(PROGS) "$(bindir)"          $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
 endif  endif
   
 ifneq ($(wildcard .depend),)  ifneq ($(wildcard .depend),)

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


unix.superglobalmegacorp.com