Commit 3d1baccb authored by Xu, Anthony's avatar Xu, Anthony Committed by Stefan Hajnoczi
Browse files

trace: Put all trace.o into libqemuutil.a 



Currently all trace.o are linked into qemu-system, qemu-img,
qemu-nbd, qemu-io etc., even the corresponding components
are not included.
Put all trace.o into libqemuutil.a that the linker would only pull in .o
files containing symbols that are actually referenced by the
program.

Signed-off -by: default avatarAnthony Xu <anthony.xu@intel.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent c53eeaf7

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ dtc/%: 
	mkdir -p $@



$(SUBDIR_RULES): libqemuutil.a libqemustub.a $(common-obj-y) $(chardev-obj-y) \

	$(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY)) $(trace-obj-y)

	$(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))



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

# Only keep -O and -g cflags
@@ -366,11 +366,11 @@ Makefile: $(version-obj-y) 
# Build libraries



libqemustub.a: $(stub-obj-y)

libqemuutil.a: $(util-obj-y)

libqemuutil.a: $(util-obj-y) $(trace-obj-y)



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



COMMON_LDADDS = $(trace-obj-y) libqemuutil.a libqemustub.a

COMMON_LDADDS = libqemuutil.a libqemustub.a



qemu-img.o: qemu-img-cmds.h

Makefile.target

+2 −3
Original line number Diff line number Diff line
@@ -188,8 +188,7 @@ dummy := $(call unnest-vars,.., \ 
               qom-obj-y \

               io-obj-y \

               common-obj-y \

               common-obj-m \

               trace-obj-y)

               common-obj-m)

target-obj-y := $(target-obj-y-save)

all-obj-y += $(common-obj-y)

all-obj-y += $(target-obj-y)
@@ -201,7 +200,7 @@ all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y) 


$(QEMU_PROG_BUILD): config-devices.mak



COMMON_LDADDS = $(trace-obj-y) ../libqemuutil.a ../libqemustub.a

COMMON_LDADDS = ../libqemuutil.a ../libqemustub.a



# build either PROG or PROGW

$(QEMU_PROG_BUILD): $(all-obj-y) $(COMMON_LDADDS)

tests/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ QEMU_CFLAGS += -I$(SRC_PATH)/tests 




# Deps that are common to various different sets of tests below

test-util-obj-y = $(trace-obj-y) libqemuutil.a libqemustub.a

test-util-obj-y = libqemuutil.a libqemustub.a

test-qom-obj-y = $(qom-obj-y) $(test-util-obj-y)

test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o \

	tests/test-qapi-event.o tests/test-qmp-introspect.o \