On Tue, Aug 8, 2017 at 3:19 PM, Eric Anholt <e...@anholt.net> wrote: > I've been trying to get away without these conditionals in vc4, but it > meant compiling extra unused code on x86, and build failing on ARMv6. > --- > Android.common.mk | 8 ++++++++ > configure.ac | 24 ++++++++++++++++++++++++ > 2 files changed, 32 insertions(+) > > diff --git a/Android.common.mk b/Android.common.mk > index 6bd30816bc41..435e3da40a5f 100644 > --- a/Android.common.mk > +++ b/Android.common.mk > @@ -87,6 +87,14 @@ LOCAL_CFLAGS += \ > -DUSE_X86_ASM > > endif > +ifeq ($(TARGET_ARCH),arm) > +LOCAL_CFLAGS += \ > + -DUSE_ARM_ASM > +endif > +ifeq ($(TARGET_ARCH),aarch64) > +LOCAL_CFLAGS += \ > + -DUSE_AARCH64_ASM > +endif
All this can just be: LOCAL_CFLAGS_arm += -DUSE_ARM_ASM LOCAL_CFLAGS_arm64 += -DUSE_AARCH64_ASM It also wouldn't have worked for dual 32/64 bit builds which arm64 builds are. Rob _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
