From 16751e0be4f07c1e99712fe844e1e0f0b46570ec Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 28 Jul 2016 14:43:46 +0100 Subject: [PATCH] isl: automake: use VISIBILITY_CFLAGS to restrict symbol visibility v2: Add VISIBILITY_CFLAGS to AM_CFLAGS (Ken) Cc: "12.0" Reviewed-by: Jason Ekstrand (v1) Signed-off-by: Emil Velikov (cherry picked from commit d61d25951887a08fd6ea2a9d0db82d52813ce532) [Emil Velikov: drop not applicable gen4-6 hunks] Signed-off-by: Emil Velikov Conflicts: src/intel/isl/Makefile.am --- src/intel/isl/Makefile.am | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/intel/isl/Makefile.am b/src/intel/isl/Makefile.am index 1fd668371d7..8e03ee68fa3 100644 --- a/src/intel/isl/Makefile.am +++ b/src/intel/isl/Makefile.am @@ -46,23 +46,25 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/auxiliary \ -I$(top_srcdir)/src/gallium/include -libisl_la_CFLAGS = $(CFLAGS) -Wno-override-init +AM_CFLAGS = \ + $(VISIBILITY_CFLAGS) \ + -Wno-override-init libisl_la_LIBADD = $(ISL_GEN_LIBS) libisl_la_SOURCES = $(ISL_FILES) $(ISL_GENERATED_FILES) libisl_gen7_la_SOURCES = $(ISL_GEN7_FILES) -libisl_gen7_la_CFLAGS = $(libisl_la_CFLAGS) -DGEN_VERSIONx10=70 +libisl_gen7_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=70 libisl_gen75_la_SOURCES = $(ISL_GEN75_FILES) -libisl_gen75_la_CFLAGS = $(libisl_la_CFLAGS) -DGEN_VERSIONx10=75 +libisl_gen75_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=75 libisl_gen8_la_SOURCES = $(ISL_GEN8_FILES) -libisl_gen8_la_CFLAGS = $(libisl_la_CFLAGS) -DGEN_VERSIONx10=80 +libisl_gen8_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=80 libisl_gen9_la_SOURCES = $(ISL_GEN9_FILES) -libisl_gen9_la_CFLAGS = $(libisl_la_CFLAGS) -DGEN_VERSIONx10=90 +libisl_gen9_la_CFLAGS = $(AM_CFLAGS) -DGEN_VERSIONx10=90 BUILT_SOURCES = $(ISL_GENERATED_FILES) -- 2.11.0