[Mesa-dev] [PATCH v3 2/4] vc4: Use a wrapper file to set VC4_BUILD_NEON instead of CFLAGS.

[Rob Herring]

On Fri, Apr 14, 2017 at 12:47 PM, Eric Anholt <eric at anholt.net> wrote:
> Android.mk was setting the flag across the entire driver, so we didn't
> have non-NEON versions getting built.  This was going to be a problem with
> the next commit, when I start auto-detecting NEON support and use the
> non-NEON version when appropriate.
> ---
>  src/gallium/drivers/vc4/Android.mk           |  2 --
>  src/gallium/drivers/vc4/Makefile.am          |  6 ------
>  src/gallium/drivers/vc4/Makefile.sources     |  1 +
>  src/gallium/drivers/vc4/vc4_tiling_lt_neon.c | 30 ++++++++++++++++++++++++++++
>  4 files changed, 31 insertions(+), 8 deletions(-)
>  create mode 100644 src/gallium/drivers/vc4/vc4_tiling_lt_neon.c
>
> diff --git a/src/gallium/drivers/vc4/Android.mk b/src/gallium/drivers/vc4/Android.mk
> index fdc06744e5ab..de9d5e3f5b3c 100644
> --- a/src/gallium/drivers/vc4/Android.mk
> +++ b/src/gallium/drivers/vc4/Android.mk
> @@ -25,8 +25,6 @@ include $(LOCAL_PATH)/Makefile.sources
>
>  include $(CLEAR_VARS)
>
> -LOCAL_CFLAGS_arm := -DVC4_BUILD_NEON
> -
>  LOCAL_SRC_FILES := \
>         $(C_SOURCES)
>
> diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am
> index b361a0c588a8..0ed49b128b2d 100644
> --- a/src/gallium/drivers/vc4/Makefile.am
> +++ b/src/gallium/drivers/vc4/Makefile.am
> @@ -41,10 +41,4 @@ libvc4_la_SOURCES = $(C_SOURCES)
>  libvc4_la_LIBADD = $(SIM_LIB) $(VC4_LIBS)
>  libvc4_la_LDFLAGS = $(SIM_LDFLAGS)
>
> -noinst_LTLIBRARIES += libvc4_neon.la
> -libvc4_la_LIBADD += libvc4_neon.la
> -
> -libvc4_neon_la_SOURCES = vc4_tiling_lt.c
> -libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -DVC4_BUILD_NEON
> -

When you asked me, I was thinking how to do a per source or .o file
CFLAG which can't be done. Now that I look at how autotools is doing
things, building 2 static libs with different flags would work for
Android as well.

Rob