KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mesa/src/gallium/Automake.inc

131 lines
3.3 KiB
PHP
Raw Normal View History

gallium: Add common automake include file v2: Matt Turner <mattst88@gmail.com> Remove ARCH_FLAGS/OPT_FLAGS v3: Johannes Obermayr <johannesobermayr@gmx.de> Add -I$(top_srcdir)/include to GALLIUM_CFLAGS
2012-07-13 18:33:09 +01:00
GALLIUM_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
Remove MESA_PIC_FLAGS macro
2012-09-06 04:41:08 +01:00
$(DEFINES)
gallium/drivers: compact compiler flags into Automake.inc * minimise flags duplication * distingush between VISIBILITY C and CXX flags * set only required flags - C and/or CXX v2: add LLVM_CFLAGS back to AM_CFLAGS (add missing backslash) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-01 18:58:27 +00:00
# src/gallium/auxiliary must appear before src/gallium/drivers
# because there are stupidly two rbug_context.h files in
# different directories, and which one is included by the
# preprocessor is determined by the ordering of the -I flags.
GALLIUM_DRIVER_CFLAGS = \
-I$(srcdir)/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
$(DEFINES) \
$(VISIBILITY_CFLAGS)
GALLIUM_DRIVER_CXXFLAGS = \
-I$(srcdir)/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
$(DEFINES) \
$(VISIBILITY_CXXFLAGS)
targets/vdpau: compact compiler flags into Automake.inc Store the compiler flags into a variable, in order to minimise flags duplication (amongst vdpau and xvmc). Note: this commit add VISIBILITY_CFLAGS to the nouveau target Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:48:44 +00:00
targets/dri: compact compiler flags into Automake.inc Greatly reduce duplication and provide a sane minimum of CFLAGS for all DRI targets. Note: This commit adds VISIBILITY_CFLAGS to the following: * freedreno * i915 * ilo * nouveau * vmwgfx Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-02 15:33:07 +00:00
GALLIUM_DRI_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
-I$(top_srcdir)/src/gallium/winsys \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/mapi \
$(DEFINES) \
$(PTHREAD_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(VISIBILITY_CFLAGS)
targets/vdpau: compact compiler flags into Automake.inc Store the compiler flags into a variable, in order to minimise flags duplication (amongst vdpau and xvmc). Note: this commit add VISIBILITY_CFLAGS to the nouveau target Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:48:44 +00:00
GALLIUM_VIDEO_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/drivers \
-I$(top_srcdir)/src/gallium/winsys \
$(DEFINES) \
$(PTHREAD_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(VISIBILITY_CFLAGS)
targets/vdpau: move linker flags to Automake.inc Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:50:47 +00:00
targets/dri: move linker flags out of configure into Automake.inc Previous assumption was that the same set of flags can be reused for both classic and gallium drivers. With megadriver work done the classic drivers ended up using their own (single) instance of the flags. Move these into Automake.inc and rename to indicate that those are gallium specific. Additionally silence an automake/autoconf warning "XXX is not a standard libtool library name", due to the parsing issues of the module tag. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 23:00:14 +00:00
gallium makefiles: use a linker script for building dri drivers Only export __driDriverExtensions by default, and radeon_drm_winsys_create on radeons. Remove -Bsymbolic which should no longer be needed. As a side effect, it ought to fix a manifestation of bug 73200 on radeon. Signed-off-by: Maarten Lankhorst<maarten.lankhorst@canonical.com> Reviewed-by: Christian König <christian.koenig@amd.com>
2014-02-12 12:50:43 +00:00
DRI_VERSION_SCRIPT ?= $(top_srcdir)/src/gallium/state_trackers/dri/dri.link
targets/dri: move linker flags out of configure into Automake.inc Previous assumption was that the same set of flags can be reused for both classic and gallium drivers. With megadriver work done the classic drivers ended up using their own (single) instance of the flags. Move these into Automake.inc and rename to indicate that those are gallium specific. Additionally silence an automake/autoconf warning "XXX is not a standard libtool library name", due to the parsing issues of the module tag. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 23:00:14 +00:00
GALLIUM_DRI_LINKER_FLAGS = \
automake: consistently use -no-undefined Set the flag for all but the dri targets. They have missing glapi symbols which are required for the normal operation with the X server. Jon, I fear that you'll need to carry the "no-undefined" hunk locally when building the dri drivers under cygwin. Cc: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 02:32:29 +00:00
-shared \
targets/dri: move linker flags out of configure into Automake.inc Previous assumption was that the same set of flags can be reused for both classic and gallium drivers. With megadriver work done the classic drivers ended up using their own (single) instance of the flags. Move these into Automake.inc and rename to indicate that those are gallium specific. Additionally silence an automake/autoconf warning "XXX is not a standard libtool library name", due to the parsing issues of the module tag. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 23:00:14 +00:00
-module \
-avoid-version \
automake: ask the linker to do garbage collection By doing GC the linker removes all the symbols that are not referenced and/or used by the final library. This results in a saving of ~100K up-to ~600K per (stripped) binary (classic vs gallium drivers). If interested one can ask the compiler to print the sections that are removed using -Wl,--print-gc-sections. v2: Check if ld supports the flag before using it. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Matt Turner <mattst88@gmail.com> (v1)
2014-03-11 17:58:08 +00:00
$(GC_SECTIONS) \
automake: consistently use -no-undefined Set the flag for all but the dri targets. They have missing glapi symbols which are required for the normal operation with the X server. Jon, I fear that you'll need to carry the "no-undefined" hunk locally when building the dri drivers under cygwin. Cc: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 02:32:29 +00:00
-Wl,--version-script=$(DRI_VERSION_SCRIPT)
targets/dri: move linker flags out of configure into Automake.inc Previous assumption was that the same set of flags can be reused for both classic and gallium drivers. With megadriver work done the classic drivers ended up using their own (single) instance of the flags. Move these into Automake.inc and rename to indicate that those are gallium specific. Additionally silence an automake/autoconf warning "XXX is not a standard libtool library name", due to the parsing issues of the module tag. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 23:00:14 +00:00
targets/vdpau: move linker flags to Automake.inc Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:50:47 +00:00
GALLIUM_VDPAU_LINKER_FLAGS = \
automake: consistently use -no-undefined Set the flag for all but the dri targets. They have missing glapi symbols which are required for the normal operation with the X server. Jon, I fear that you'll need to carry the "no-undefined" hunk locally when building the dri drivers under cygwin. Cc: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 02:32:29 +00:00
-shared \
targets/vdpau: move linker flags to Automake.inc Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:50:47 +00:00
-module \
automake: consistently use -no-undefined Set the flag for all but the dri targets. They have missing glapi symbols which are required for the normal operation with the X server. Jon, I fear that you'll need to carry the "no-undefined" hunk locally when building the dri drivers under cygwin. Cc: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 02:32:29 +00:00
-no-undefined \
targets/vdpau: move linker flags to Automake.inc Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:50:47 +00:00
-version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
automake: add -Wl,--no-undefined to all libraries ... apart from the dri drivers. With this final change we can build mesa without fear that the resulting libraries will have unresolved symbols. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 05:44:33 +00:00
-export-symbols-regex $(VDPAU_EXPORTS) \
automake: ask the linker to do garbage collection By doing GC the linker removes all the symbols that are not referenced and/or used by the final library. This results in a saving of ~100K up-to ~600K per (stripped) binary (classic vs gallium drivers). If interested one can ask the compiler to print the sections that are removed using -Wl,--print-gc-sections. v2: Check if ld supports the flag before using it. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Matt Turner <mattst88@gmail.com> (v1)
2014-03-11 17:58:08 +00:00
$(GC_SECTIONS) \
automake: add -Wl,--no-undefined to all libraries ... apart from the dri drivers. With this final change we can build mesa without fear that the resulting libraries will have unresolved symbols. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 05:44:33 +00:00
-Wl,--no-undefined
targets/vdpau: consolidate lib deps into Automake.inc Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:51:19 +00:00
targets/xvmc: move linker flags to Automake.inc Minimise duplication and sources of error (eg nouveau was missing shared and no-undefined) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:54:58 +00:00
GALLIUM_XVMC_LINKER_FLAGS = \
automake: consistently use -no-undefined Set the flag for all but the dri targets. They have missing glapi symbols which are required for the normal operation with the X server. Jon, I fear that you'll need to carry the "no-undefined" hunk locally when building the dri drivers under cygwin. Cc: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 02:32:29 +00:00
-shared \
targets/xvmc: move linker flags to Automake.inc Minimise duplication and sources of error (eg nouveau was missing shared and no-undefined) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:54:58 +00:00
-module \
automake: consistently use -no-undefined Set the flag for all but the dri targets. They have missing glapi symbols which are required for the normal operation with the X server. Jon, I fear that you'll need to carry the "no-undefined" hunk locally when building the dri drivers under cygwin. Cc: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 02:32:29 +00:00
-no-undefined \
targets/xvmc: move linker flags to Automake.inc Minimise duplication and sources of error (eg nouveau was missing shared and no-undefined) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:54:58 +00:00
-version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
automake: add -Wl,--no-undefined to all libraries ... apart from the dri drivers. With this final change we can build mesa without fear that the resulting libraries will have unresolved symbols. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 05:44:33 +00:00
-export-symbols-regex '^XvMC' \
automake: ask the linker to do garbage collection By doing GC the linker removes all the symbols that are not referenced and/or used by the final library. This results in a saving of ~100K up-to ~600K per (stripped) binary (classic vs gallium drivers). If interested one can ask the compiler to print the sections that are removed using -Wl,--print-gc-sections. v2: Check if ld supports the flag before using it. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Matt Turner <mattst88@gmail.com> (v1)
2014-03-11 17:58:08 +00:00
$(GC_SECTIONS) \
automake: add -Wl,--no-undefined to all libraries ... apart from the dri drivers. With this final change we can build mesa without fear that the resulting libraries will have unresolved symbols. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 05:44:33 +00:00
-Wl,--no-undefined
targets/xvmc: move linker flags to Automake.inc Minimise duplication and sources of error (eg nouveau was missing shared and no-undefined) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:54:58 +00:00
targets/omx: use GALLIUM_OMX_LINKER_FLAGS Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Christian König <christian.koenig@amd.com>
2014-03-13 02:28:21 +00:00
GALLIUM_OMX_LINKER_FLAGS = \
-shared \
-module \
-no-undefined \
automake: add -Wl,--no-undefined to all libraries ... apart from the dri drivers. With this final change we can build mesa without fear that the resulting libraries will have unresolved symbols. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 05:44:33 +00:00
-export-symbols-regex $(EXPORTS) \
automake: ask the linker to do garbage collection By doing GC the linker removes all the symbols that are not referenced and/or used by the final library. This results in a saving of ~100K up-to ~600K per (stripped) binary (classic vs gallium drivers). If interested one can ask the compiler to print the sections that are removed using -Wl,--print-gc-sections. v2: Check if ld supports the flag before using it. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Acked-by: Matt Turner <mattst88@gmail.com> (v1)
2014-03-11 17:58:08 +00:00
$(GC_SECTIONS) \
automake: add -Wl,--no-undefined to all libraries ... apart from the dri drivers. With this final change we can build mesa without fear that the resulting libraries will have unresolved symbols. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2014-03-13 05:44:33 +00:00
-Wl,--no-undefined
targets/omx: use GALLIUM_OMX_LINKER_FLAGS Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Christian König <christian.koenig@amd.com>
2014-03-13 02:28:21 +00:00
targets/vdpau: consolidate lib deps into Automake.inc Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:51:19 +00:00
GALLIUM_VDPAU_LIB_DEPS = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
$(VDPAU_LIBS) \
targets/vdpau: Don't link unused libraries libvdpau, libselinux and libexpat are not used. Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
2014-02-17 08:29:14 +00:00
$(LIBDRM_LIBS) \
-lm \
$(CLOCK_LIB) \
$(PTHREAD_LIBS) \
$(DLOPEN_LIBS)
targets/vdpau: consolidate lib deps into Automake.inc Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:51:19 +00:00
targets/xvmc: consolidate lib deps into Automake.inc Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-09 22:55:59 +00:00
GALLIUM_XVMC_LIB_DEPS = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
$(XVMC_LIBS) \
$(LIBDRM_LIBS)
targets/omx: introduce GALLIUM_OMX_LIB_DEPS Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Christian König <christian.koenig@amd.com>
2014-03-11 02:45:23 +00:00
GALLIUM_OMX_LIB_DEPS = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \
$(GALLIUM_DRI_LIB_DEPS) \
$(OMX_LIBS)
gallium/winsys: compact compiler flags into Automake.inc Cleanup the duplicating flags and consolidate into a sigle variable. Note: this patch adds VISIBILITY_CFLAGS to the following targets * freedreno/drm * i915/{drm,sw} * nouveau/drm * sw/fbdev * sw/null * sw/wayland * sw/wrapper * sw/xlib Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2013-11-02 02:02:47 +00:00
GALLIUM_WINSYS_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
$(DEFINES) \
$(VISIBILITY_CFLAGS)
gallium/targets: fold LLVM_LDFLAGS inside Automake.inc Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2014-03-11 02:21:21 +00:00
if HAVE_MESA_LLVM
GALLIUM_DRI_LINKER_FLAGS += $(LLVM_LDFLAGS)
GALLIUM_VDPAU_LINKER_FLAGS += $(LLVM_LDFLAGS)
GALLIUM_XVMC_LINKER_FLAGS += $(LLVM_LDFLAGS)
GALLIUM_OMX_LINKER_FLAGS += $(LLVM_LDFLAGS)
gallium/targets: move LLVM_LIBS handling inside Automake.inc Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2014-03-11 13:34:53 +00:00
GALLIUM_DRI_LIB_DEPS += $(LLVM_LIBS)
GALLIUM_VDPAU_LIB_DEPS += $(LLVM_LIBS)
GALLIUM_XVMC_LIB_DEPS += $(LLVM_LIBS)
GALLIUM_OMX_LIB_DEPS += $(LLVM_LIBS)
gallium/targets: fold LLVM_LDFLAGS inside Automake.inc Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2014-03-11 02:21:21 +00:00
endif