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

version 1.1.1.3, 2018/04/24 16:40:51 version 1.1.1.4, 2018/04/24 16:42:53
Line 30  ifeq ($(TARGET_ARCH),arm) Line 30  ifeq ($(TARGET_ARCH),arm)
     TARGET_ARCH2=armeb      TARGET_ARCH2=armeb
   endif    endif
 endif  endif
   ifeq ($(TARGET_ARCH),sh4)
     ifeq ($(TARGET_WORDS_BIGENDIAN),yes)
       TARGET_ARCH2=sh4eb
     endif
   endif
 ifeq ($(TARGET_ARCH),mips)  ifeq ($(TARGET_ARCH),mips)
   ifneq ($(TARGET_WORDS_BIGENDIAN),yes)    ifneq ($(TARGET_WORDS_BIGENDIAN),yes)
     TARGET_ARCH2=mipsel      TARGET_ARCH2=mipsel
Line 102  LDFLAGS+=-Wl,-T,$(SRC_PATH)/s390.ld Line 107  LDFLAGS+=-Wl,-T,$(SRC_PATH)/s390.ld
 endif  endif
   
 ifeq ($(ARCH),sparc)  ifeq ($(ARCH),sparc)
 CFLAGS+=-m32 -ffixed-g1 -ffixed-g2 -ffixed-g3 -ffixed-g6  ifeq ($(CONFIG_SOLARIS),yes)
   CFLAGS+=-mcpu=ultrasparc -m32 -ffixed-g2 -ffixed-g3
   LDFLAGS+=-m32
   OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -fno-omit-frame-pointer -ffixed-i0
   else
   CFLAGS+=-mcpu=ultrasparc -m32 -ffixed-g1 -ffixed-g2 -ffixed-g3 -ffixed-g6
 LDFLAGS+=-m32  LDFLAGS+=-m32
 OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0  OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0
 HELPER_CFLAGS=$(CFLAGS) -ffixed-i0 -mflat  HELPER_CFLAGS=$(CFLAGS) -ffixed-i0 -mflat
 # -static is used to avoid g1/g3 usage by the dynamic linker  # -static is used to avoid g1/g3 usage by the dynamic linker
 LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc.ld -static  LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc.ld -static
 endif  endif
   endif
   
 ifeq ($(ARCH),sparc64)  ifeq ($(ARCH),sparc64)
 CFLAGS+=-m64 -ffixed-g1 -ffixed-g2 -ffixed-g3 -ffixed-g6  CFLAGS+=-mcpu=ultrasparc -m64 -ffixed-g1 -ffixed-g4 -ffixed-g5 -ffixed-g7
 LDFLAGS+=-m64  LDFLAGS+=-m64
   LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc64.ld
 OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0  OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0
 endif  endif
   
Line 171  LDFLAGS+=-p Line 183  LDFLAGS+=-p
 main.o: CFLAGS+=-p  main.o: CFLAGS+=-p
 endif  endif
   
 OBJS= elfload.o main.o syscall.o mmap.o signal.o path.o osdep.o thunk.o   OBJS= main.o syscall.o mmap.o signal.o path.o osdep.o thunk.o \
         elfload.o linuxload.o
   ifdef TARGET_HAS_BFLT
   OBJS+= flatload.o
   endif
   
 ifeq ($(TARGET_ARCH), i386)  ifeq ($(TARGET_ARCH), i386)
 OBJS+= vm86.o  OBJS+= vm86.o
 endif  endif
Line 305  endif Line 322  endif
 ifdef CONFIG_ADLIB  ifdef CONFIG_ADLIB
 SOUND_HW += fmopl.o adlib.o  SOUND_HW += fmopl.o adlib.o
 endif  endif
   AUDIODRV+= wavcapture.o
   
   # SCSI layer
   VL_OBJS+= scsi-disk.o cdrom.o lsi53c895a.o
   
 # USB layer  # USB layer
 VL_OBJS+= usb.o usb-hub.o usb-uhci.o usb-linux.o usb-hid.o  VL_OBJS+= usb.o usb-hub.o usb-linux.o usb-hid.o usb-ohci.o usb-msd.o
   
 # PCI network cards  # PCI network cards
 VL_OBJS+= ne2000.o rtl8139.o  VL_OBJS+= ne2000.o rtl8139.o pcnet.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 $(AUDIODRV)
 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  VL_OBJS+= cirrus_vga.o mixeng.o apic.o parallel.o acpi.o piix_pci.o
   VL_OBJS+= usb-uhci.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 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
   VL_OBJS+= grackle_pci.o prep_pci.o unin_pci.o
 DEFINES += -DHAS_AUDIO  DEFINES += -DHAS_AUDIO
 endif  endif
 ifeq ($(TARGET_ARCH), mips)  ifeq ($(TARGET_ARCH), mips)
Line 331  VL_OBJS+= mips_r4k.o dma.o vga.o serial. Line 354  VL_OBJS+= mips_r4k.o dma.o vga.o serial.
 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  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
 else  else
Line 342  endif Line 365  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 pl050.o pl080.o pl110.o pl190.o
   VL_OBJS+= versatile_pci.o
 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 sh7750.o sh7750_regnames.o tc58128.o
Line 379  endif Line 403  endif
 ifndef CONFIG_DARWIN  ifndef CONFIG_DARWIN
 ifndef CONFIG_WIN32  ifndef CONFIG_WIN32
 ifndef CONFIG_SOLARIS  ifndef CONFIG_SOLARIS
 VL_LIBS=-lutil  VL_LIBS=-lutil -lrt
 endif  endif
 endif  endif
 endif  endif
Line 392  ifeq ($(ARCH),ia64) Line 416  ifeq ($(ARCH),ia64)
 VL_LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/ia64.ld  VL_LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/ia64.ld
 endif  endif
   
   ifeq ($(ARCH),sparc64)
   VL_LDFLAGS+=-m64
   VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/sparc64.ld
   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
Line 471  endif Line 500  endif
   
 loader.o: loader.c elf_ops.h  loader.o: loader.c elf_ops.h
   
   acpi.o: acpi.c acpi-dsdt.hex
   
   ifdef BUILD_ACPI_TABLES
   $(SRC_PATH)/hw/acpi-dsdt.hex: acpi-dsdt.dsl
           iasl -tc -p $@ $<
   endif
   
 ifeq ($(TARGET_ARCH), sh4)  ifeq ($(TARGET_ARCH), sh4)
 op.o: op.c op_mem.c cpu.h  op.o: op.c op_mem.c cpu.h
 op_helper.o: op_helper.c exec.h cpu.h  op_helper.o: op_helper.c exec.h cpu.h
Line 481  sh7750_regnames.o: sh7750_regnames.c sh7 Line 517  sh7750_regnames.o: sh7750_regnames.c sh7
 tc58128.o: tc58128.c  tc58128.o: tc58128.c
 endif  endif
   
   $(OBJS) $(LIBOBJS) $(VL_OBJS): config.h ../config-host.h
   
 %.o: %.c  %.o: %.c
         $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<          $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
   

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


unix.superglobalmegacorp.com