Hi Drew, On 1/26/24 15:23, Andrew Jones wrote: > Prepare for an architecture which will share the same lib/$ARCH > directory, but be configured with different arch names for different > bit widths, i.e. riscv32 -> lib/riscv and riscv64 -> lib/riscv. > > Signed-off-by: Andrew Jones <andrew.jones@xxxxxxxxx> > Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx> > Acked-by: Thomas Huth <thuth@xxxxxxxxxx> Reviewed-by: Eric Auger <eric.auger@xxxxxxxxxx> Eric > --- > Makefile | 2 +- > configure | 2 ++ > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 602910dda11b..4f35fffc685b 100644 > --- a/Makefile > +++ b/Makefile > @@ -10,7 +10,7 @@ include config.mak > VPATH = $(SRCDIR) > > libdirs-get = $(shell [ -d "lib/$(1)" ] && echo "lib/$(1) lib/$(1)/asm") > -ARCH_LIBDIRS := $(call libdirs-get,$(ARCH)) $(call libdirs-get,$(TEST_DIR)) > +ARCH_LIBDIRS := $(call libdirs-get,$(ARCH_LIBDIR)) $(call libdirs-get,$(TEST_DIR)) > OBJDIRS := $(ARCH_LIBDIRS) > > DESTDIR := $(PREFIX)/share/kvm-unit-tests/ > diff --git a/configure b/configure > index 6ee9b27a6af2..ada6512702a1 100755 > --- a/configure > +++ b/configure > @@ -198,6 +198,7 @@ fi > arch_name=$arch > [ "$arch" = "aarch64" ] && arch="arm64" > [ "$arch_name" = "arm64" ] && arch_name="aarch64" > +arch_libdir=$arch > > if [ -z "$target" ]; then > target="qemu" > @@ -391,6 +392,7 @@ PREFIX=$prefix > HOST=$host > ARCH=$arch > ARCH_NAME=$arch_name > +ARCH_LIBDIR=$arch_libdir > PROCESSOR=$processor > CC=$cross_prefix$cc > CFLAGS=$cflags
