Commit 76cad711 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

build: kill libdis, move disassemblers to disas/ 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c1c93672

.gitignore

+1 −0
Original line number Diff line number Diff line 
config-devices.*

config-all-devices.*

config-all-disas.*

config-host.*

config-target.*

trace.h

Makefile

+5 −4
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ defconfig: 
	rm -f config-all-devices.mak $(SUBDIR_DEVICES_MAK)



-include config-all-devices.mak

-include config-all-disas.mak



all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
@@ -129,9 +130,9 @@ $(SRC_PATH)/pixman/configure: 


$(SUBDIR_RULES): libqemustub.a



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

$(filter %-softmmu,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) $(common-obj-y) $(extra-obj-y)



$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libdis-user subdir-libuser

$(filter %-user,$(SUBDIR_RULES)): $(universal-obj-y) $(trace-obj-y) subdir-libuser



ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))

romsubdir-%:
@@ -223,7 +224,7 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) 


qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(oslib-obj-y) $(trace-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) libqemustub.a



QEMULIBS=libuser libdis libdis-user

QEMULIBS=libuser



clean:

# avoid old build problems by removing potentially incorrect old files
@@ -255,7 +256,7 @@ qemu-%.tar.bz2: 


distclean: clean

	rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi

	rm -f config-all-devices.mak

	rm -f config-all-devices.mak config-all-disas.mak

	rm -f roms/seabios/config.mak roms/vgabios/config.mak

	rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps qemu-doc.dvi

	rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys

Makefile.dis

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
# Makefile for disassemblers.



include ../config-host.mak

include config.mak

include $(SRC_PATH)/rules.mak



.PHONY: all



$(call set-vpath, $(SRC_PATH))



QEMU_CFLAGS+=-I..



include $(SRC_PATH)/Makefile.objs



all: $(libdis-y)

# Dummy command so that make thinks it has done something

	@true



clean:

	rm -f *.o *.d *.a *~

Makefile.objs

+3 −16
Original line number Diff line number Diff line
@@ -127,24 +127,10 @@ user-obj-y += $(trace-obj-y) 
user-obj-y += qom/



######################################################################

# libdis

# disassemblers

# NOTE: the disassembler code is only needed for debugging



libdis-y =

libdis-$(CONFIG_ALPHA_DIS) += alpha-dis.o

libdis-$(CONFIG_ARM_DIS) += arm-dis.o

libdis-$(CONFIG_CRIS_DIS) += cris-dis.o

libdis-$(CONFIG_HPPA_DIS) += hppa-dis.o

libdis-$(CONFIG_I386_DIS) += i386-dis.o

libdis-$(CONFIG_IA64_DIS) += ia64-dis.o

libdis-$(CONFIG_M68K_DIS) += m68k-dis.o

libdis-$(CONFIG_MICROBLAZE_DIS) += microblaze-dis.o

libdis-$(CONFIG_MIPS_DIS) += mips-dis.o

libdis-$(CONFIG_PPC_DIS) += ppc-dis.o

libdis-$(CONFIG_S390_DIS) += s390-dis.o

libdis-$(CONFIG_SH4_DIS) += sh4-dis.o

libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o

libdis-$(CONFIG_LM32_DIS) += lm32-dis.o

universal-obj-y += disas/



######################################################################

# trace
@@ -252,5 +238,6 @@ nested-vars += \ 
	block-obj-y \

	user-obj-y \

	common-obj-y \

	universal-obj-y \

	extra-obj-y

dummy := $(call unnest-vars)

Makefile.target

+1 −4
Original line number Diff line number Diff line
@@ -70,9 +70,8 @@ obj-y = exec.o translate-all.o cpu-exec.o 
obj-y += tcg/tcg.o tcg/optimize.o

obj-$(CONFIG_TCG_INTERPRETER) += tci.o

obj-y += fpu/softfloat.o

obj-y += disas.o

obj-$(CONFIG_TCI_DIS) += tci-dis.o

obj-y += target-$(TARGET_BASE_ARCH)/

obj-y += disas.o

obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o



tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci
@@ -156,11 +155,9 @@ all-obj-y += $(addprefix ../, $(universal-obj-y)) 


ifdef CONFIG_SOFTMMU

all-obj-y += $(addprefix ../, $(common-obj-y))

all-obj-y += $(addprefix ../libdis/, $(libdis-y))

all-obj-y += $(addprefix ../, $(trace-obj-y))

else

all-obj-y += $(addprefix ../libuser/, $(user-obj-y))

all-obj-y += $(addprefix ../libdis-user/, $(libdis-y))

endif #CONFIG_LINUX_USER



ifdef QEMU_PROGW