Message ID | 20190615154352.26824-3-philmd@redhat.com |
---|---|
State | New |
Headers | show |
Series | Support disabling TCG on ARM | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> writes: > Group ARM objects together, TCG related ones at the bottom. > This will help when restricting TCG-only objects. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > target/arm/Makefile.objs | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs > index 7c31fa01c1..3269dda613 100644 > --- a/target/arm/Makefile.objs > +++ b/target/arm/Makefile.objs > @@ -4,11 +4,9 @@ obj-$(CONFIG_KVM) += kvm.o > obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) += kvm32.o > obj-$(call land,$(CONFIG_KVM),$(TARGET_AARCH64)) += kvm64.o > obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o > -obj-y += translate.o op_helper.o helper.o cpu.o > -obj-y += neon_helper.o iwmmxt_helper.o vec_helper.o vfp_helper.o > +obj-y += helper.o cpu.o > obj-y += gdbstub.o > obj-$(TARGET_AARCH64) += cpu64.o gdbstub64.o > -obj-y += crypto_helper.o > obj-$(CONFIG_SOFTMMU) += arm-powerctl.o > > DECODETREE = $(SRC_PATH)/scripts/decodetree.py > @@ -32,6 +30,11 @@ target/arm/translate-sve.o: target/arm/decode-sve.inc.c > target/arm/translate.o: target/arm/decode-vfp.inc.c > target/arm/translate.o: target/arm/decode-vfp-uncond.inc.c > > +obj-y += translate.o op_helper.o > +obj-y += crypto_helper.o > +obj-y += iwmmxt_helper.o vec_helper.o > +obj-y += neon_helper.o vfp_helper.o > + > obj-$(TARGET_AARCH64) += translate-a64.o helper-a64.o > obj-$(TARGET_AARCH64) += translate-sve.o sve_helper.o > obj-$(TARGET_AARCH64) += pauth_helper.o -- Alex Bennée
Philippe Mathieu-Daudé <philmd@redhat.com> writes: > Group ARM objects together, TCG related ones at the bottom. > This will help when restricting TCG-only objects. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > target/arm/Makefile.objs | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs > index 7c31fa01c1..3269dda613 100644 > --- a/target/arm/Makefile.objs > +++ b/target/arm/Makefile.objs > @@ -4,11 +4,9 @@ obj-$(CONFIG_KVM) += kvm.o > obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) += kvm32.o > obj-$(call land,$(CONFIG_KVM),$(TARGET_AARCH64)) += kvm64.o > obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o > -obj-y += translate.o op_helper.o helper.o cpu.o > -obj-y += neon_helper.o iwmmxt_helper.o vec_helper.o vfp_helper.o > +obj-y += helper.o cpu.o > obj-y += gdbstub.o > obj-$(TARGET_AARCH64) += cpu64.o gdbstub64.o > -obj-y += crypto_helper.o > obj-$(CONFIG_SOFTMMU) += arm-powerctl.o > > DECODETREE = $(SRC_PATH)/scripts/decodetree.py > @@ -32,6 +30,11 @@ target/arm/translate-sve.o: target/arm/decode-sve.inc.c > target/arm/translate.o: target/arm/decode-vfp.inc.c > target/arm/translate.o: target/arm/decode-vfp-uncond.inc.c > > +obj-y += translate.o op_helper.o > +obj-y += crypto_helper.o > +obj-y += iwmmxt_helper.o vec_helper.o > +obj-y += neon_helper.o vfp_helper.o > + > obj-$(TARGET_AARCH64) += translate-a64.o helper-a64.o > obj-$(TARGET_AARCH64) += translate-sve.o sve_helper.o > obj-$(TARGET_AARCH64) += pauth_helper.o -- Alex Bennée
diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs index 7c31fa01c1..3269dda613 100644 --- a/target/arm/Makefile.objs +++ b/target/arm/Makefile.objs @@ -4,11 +4,9 @@ obj-$(CONFIG_KVM) += kvm.o obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) += kvm32.o obj-$(call land,$(CONFIG_KVM),$(TARGET_AARCH64)) += kvm64.o obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o -obj-y += translate.o op_helper.o helper.o cpu.o -obj-y += neon_helper.o iwmmxt_helper.o vec_helper.o vfp_helper.o +obj-y += helper.o cpu.o obj-y += gdbstub.o obj-$(TARGET_AARCH64) += cpu64.o gdbstub64.o -obj-y += crypto_helper.o obj-$(CONFIG_SOFTMMU) += arm-powerctl.o DECODETREE = $(SRC_PATH)/scripts/decodetree.py @@ -32,6 +30,11 @@ target/arm/translate-sve.o: target/arm/decode-sve.inc.c target/arm/translate.o: target/arm/decode-vfp.inc.c target/arm/translate.o: target/arm/decode-vfp-uncond.inc.c +obj-y += translate.o op_helper.o +obj-y += crypto_helper.o +obj-y += iwmmxt_helper.o vec_helper.o +obj-y += neon_helper.o vfp_helper.o + obj-$(TARGET_AARCH64) += translate-a64.o helper-a64.o obj-$(TARGET_AARCH64) += translate-sve.o sve_helper.o obj-$(TARGET_AARCH64) += pauth_helper.o
Group ARM objects together, TCG related ones at the bottom. This will help when restricting TCG-only objects. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- target/arm/Makefile.objs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)