Using -export-symbols-regex all private symbols are hidden, resulting in the following changes:
libkms: removes all driver specific exports radeon: removes the bof_* exports nouveau: removes the abi16_* exports freedreno: remove the *kgsl_* and msm_* exports intel: removes the drm_mm* exports omap/exynos: unchanged as far as I can tell
Signed-off-by: Maarten Lankhorst maarten.lankhorst@canonical.com ---
diff --git a/exynos/Makefile.am b/exynos/Makefile.am index 0a2663a..0cd753d 100644 --- a/exynos/Makefile.am +++ b/exynos/Makefile.am @@ -7,7 +7,8 @@ AM_CFLAGS = \
libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la libdrm_exynos_ladir = $(libdir) -libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined \ + -export-symbols-regex '^(exynos|g2d)_' libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_exynos_la_SOURCES = \ diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am index 7903e5b..5fdee22 100644 --- a/freedreno/Makefile.am +++ b/freedreno/Makefile.am @@ -9,7 +9,8 @@ AM_CFLAGS = \
libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la libdrm_freedreno_ladir = $(libdir) -libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined \ + -export-symbols-regex '^fd_' libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_freedreno_la_SOURCES = \ diff --git a/intel/Makefile.am b/intel/Makefile.am index f49b099..2b9ee48 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -33,7 +33,8 @@ AM_CFLAGS = \
libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_ladir = $(libdir) -libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined \ + -export-symbols-regex '^drm_intel_' libdrm_intel_la_LIBADD = ../libdrm.la \ @PTHREADSTUBS_LIBS@ \ @PCIACCESS_LIBS@ \ diff --git a/libkms/Makefile.am b/libkms/Makefile.am index 449a73b..e3c727a 100644 --- a/libkms/Makefile.am +++ b/libkms/Makefile.am @@ -5,7 +5,8 @@ AM_CFLAGS = \
libkms_la_LTLIBRARIES = libkms.la libkms_ladir = $(libdir) -libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined \ + -export-symbols-regex '^kms_' libkms_la_LIBADD = ../libdrm.la
#if HAVE_LIBUDEV diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index 206e892..257cab9 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -8,7 +8,8 @@ AM_CFLAGS = \
libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la libdrm_nouveau_ladir = $(libdir) -libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined +libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined \ + -export-symbols-regex '^nouveau_' libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_nouveau_la_SOURCES = nouveau.c \ diff --git a/omap/Makefile.am b/omap/Makefile.am index c77520b..bcbe98e 100644 --- a/omap/Makefile.am +++ b/omap/Makefile.am @@ -7,7 +7,8 @@ AM_CFLAGS = \
libdrm_omap_la_LTLIBRARIES = libdrm_omap.la libdrm_omap_ladir = $(libdir) -libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined \ + -export-symbols-regex '^omap_' libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_omap_la_SOURCES = omap_drm.c diff --git a/radeon/Makefile.am b/radeon/Makefile.am index a8cd100..9fa19a8 100644 --- a/radeon/Makefile.am +++ b/radeon/Makefile.am @@ -31,7 +31,8 @@ AM_CFLAGS = \
libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la libdrm_radeon_ladir = $(libdir) -libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined +libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined \ + -export-symbols-regex '^radeon_' libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_radeon_la_SOURCES = \
[CCing Emil as well]
Am 30.07.2014 um 11:38 schrieb Maarten Lankhorst:
Using -export-symbols-regex all private symbols are hidden, resulting in the following changes:
Wasn't "-export-symbols-regex" exactly that stuff we are trying to avoid in mesa?
Christian.
libkms: removes all driver specific exports radeon: removes the bof_* exports nouveau: removes the abi16_* exports freedreno: remove the *kgsl_* and msm_* exports intel: removes the drm_mm* exports omap/exynos: unchanged as far as I can tell
Signed-off-by: Maarten Lankhorst maarten.lankhorst@canonical.com
diff --git a/exynos/Makefile.am b/exynos/Makefile.am index 0a2663a..0cd753d 100644 --- a/exynos/Makefile.am +++ b/exynos/Makefile.am @@ -7,7 +7,8 @@ AM_CFLAGS = \
libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la libdrm_exynos_ladir = $(libdir) -libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined \
-export-symbols-regex '^(exynos|g2d)_' libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_exynos_la_SOURCES = \
diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am index 7903e5b..5fdee22 100644 --- a/freedreno/Makefile.am +++ b/freedreno/Makefile.am @@ -9,7 +9,8 @@ AM_CFLAGS = \
libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la libdrm_freedreno_ladir = $(libdir) -libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined \
-export-symbols-regex '^fd_' libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_freedreno_la_SOURCES = \
diff --git a/intel/Makefile.am b/intel/Makefile.am index f49b099..2b9ee48 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -33,7 +33,8 @@ AM_CFLAGS = \
libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_ladir = $(libdir) -libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined \
- -export-symbols-regex '^drm_intel_' libdrm_intel_la_LIBADD = ../libdrm.la \ @PTHREADSTUBS_LIBS@ \ @PCIACCESS_LIBS@ \
diff --git a/libkms/Makefile.am b/libkms/Makefile.am index 449a73b..e3c727a 100644 --- a/libkms/Makefile.am +++ b/libkms/Makefile.am @@ -5,7 +5,8 @@ AM_CFLAGS = \
libkms_la_LTLIBRARIES = libkms.la libkms_ladir = $(libdir) -libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined \
-export-symbols-regex '^kms_' libkms_la_LIBADD = ../libdrm.la
#if HAVE_LIBUDEV
diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index 206e892..257cab9 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -8,7 +8,8 @@ AM_CFLAGS = \
libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la libdrm_nouveau_ladir = $(libdir) -libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined +libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined \
-export-symbols-regex '^nouveau_' libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_nouveau_la_SOURCES = nouveau.c \
diff --git a/omap/Makefile.am b/omap/Makefile.am index c77520b..bcbe98e 100644 --- a/omap/Makefile.am +++ b/omap/Makefile.am @@ -7,7 +7,8 @@ AM_CFLAGS = \
libdrm_omap_la_LTLIBRARIES = libdrm_omap.la libdrm_omap_ladir = $(libdir) -libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined \
-export-symbols-regex '^omap_' libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_omap_la_SOURCES = omap_drm.c
diff --git a/radeon/Makefile.am b/radeon/Makefile.am index a8cd100..9fa19a8 100644 --- a/radeon/Makefile.am +++ b/radeon/Makefile.am @@ -31,7 +31,8 @@ AM_CFLAGS = \
libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la libdrm_radeon_ladir = $(libdir) -libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined +libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined \
-export-symbols-regex '^radeon_' libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
libdrm_radeon_la_SOURCES = \
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
On 30/07/14 11:16, Christian König wrote:
[CCing Emil as well]
Am 30.07.2014 um 11:38 schrieb Maarten Lankhorst:
Using -export-symbols-regex all private symbols are hidden, resulting in the following changes:
Wasn't "-export-symbols-regex" exactly that stuff we are trying to avoid in mesa?
IMHO we should try to pick up Thierry visibility patches, as these are the best solution + BSD's ld lacks version-script support. Then use a version-script over export-symbols-regex, as the latter messes up local symbols apart from the exported ones.
-Emil
Christian.
libkms: removes all driver specific exports radeon: removes the bof_* exports nouveau: removes the abi16_* exports freedreno: remove the *kgsl_* and msm_* exports intel: removes the drm_mm* exports omap/exynos: unchanged as far as I can tell Signed-off-by: Maarten Lankhorst maarten.lankhorst@canonical.com
diff --git a/exynos/Makefile.am b/exynos/Makefile.am index 0a2663a..0cd753d 100644 --- a/exynos/Makefile.am +++ b/exynos/Makefile.am @@ -7,7 +7,8 @@ AM_CFLAGS = \ libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la libdrm_exynos_ladir = $(libdir) -libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined \
- -export-symbols-regex '^(exynos|g2d)_' libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ libdrm_exynos_la_SOURCES = \
diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am index 7903e5b..5fdee22 100644 --- a/freedreno/Makefile.am +++ b/freedreno/Makefile.am @@ -9,7 +9,8 @@ AM_CFLAGS = \ libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la libdrm_freedreno_ladir = $(libdir) -libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined \
- -export-symbols-regex '^fd_' libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ libdrm_freedreno_la_SOURCES = \
diff --git a/intel/Makefile.am b/intel/Makefile.am index f49b099..2b9ee48 100644 --- a/intel/Makefile.am +++ b/intel/Makefile.am @@ -33,7 +33,8 @@ AM_CFLAGS = \ libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_ladir = $(libdir) -libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined \
- -export-symbols-regex '^drm_intel_' libdrm_intel_la_LIBADD = ../libdrm.la \ @PTHREADSTUBS_LIBS@ \ @PCIACCESS_LIBS@ \
diff --git a/libkms/Makefile.am b/libkms/Makefile.am index 449a73b..e3c727a 100644 --- a/libkms/Makefile.am +++ b/libkms/Makefile.am @@ -5,7 +5,8 @@ AM_CFLAGS = \ libkms_la_LTLIBRARIES = libkms.la libkms_ladir = $(libdir) -libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libkms_la_LDFLAGS = -version-number 1:0:0 -no-undefined \
- -export-symbols-regex '^kms_' libkms_la_LIBADD = ../libdrm.la #if HAVE_LIBUDEV
diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am index 206e892..257cab9 100644 --- a/nouveau/Makefile.am +++ b/nouveau/Makefile.am @@ -8,7 +8,8 @@ AM_CFLAGS = \ libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la libdrm_nouveau_ladir = $(libdir) -libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined +libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined \
- -export-symbols-regex '^nouveau_' libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ libdrm_nouveau_la_SOURCES = nouveau.c \
diff --git a/omap/Makefile.am b/omap/Makefile.am index c77520b..bcbe98e 100644 --- a/omap/Makefile.am +++ b/omap/Makefile.am @@ -7,7 +7,8 @@ AM_CFLAGS = \ libdrm_omap_la_LTLIBRARIES = libdrm_omap.la libdrm_omap_ladir = $(libdir) -libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined +libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined \
- -export-symbols-regex '^omap_' libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ libdrm_omap_la_SOURCES = omap_drm.c
diff --git a/radeon/Makefile.am b/radeon/Makefile.am index a8cd100..9fa19a8 100644 --- a/radeon/Makefile.am +++ b/radeon/Makefile.am @@ -31,7 +31,8 @@ AM_CFLAGS = \ libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la libdrm_radeon_ladir = $(libdir) -libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined +libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined \
- -export-symbols-regex '^radeon_' libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ libdrm_radeon_la_SOURCES = \
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
From: Thierry Reding treding@nvidia.com
Checks whether or not the compiler supports the -fvisibility option. If so it sets the VISIBILITY_CFLAGS variable which can be added to the per directory AM_CFLAGS where appropriate.
By default all symbols will be hidden via the VISIBILITY_CFLAGS. The drm_public macro can be used to mark symbols that should be exported.
Signed-off-by: Thierry Reding treding@nvidia.com --- Changes in v3: - distribute libdrm.h
Makefile.am | 1 + configure.ac | 20 ++++++++++++++++++++ libdrm.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 libdrm.h
diff --git a/Makefile.am b/Makefile.am index 826c30d0c0d9..65680da963eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,7 @@ libdrm_la_SOURCES = \ xf86drmSL.c \ xf86drmMode.c \ xf86atomic.h \ + libdrm.h \ libdrm_lists.h
libdrmincludedir = ${includedir} diff --git a/configure.ac b/configure.ac index 1c78c4520c49..f7c7177bfb2a 100644 --- a/configure.ac +++ b/configure.ac @@ -366,6 +366,26 @@ AC_ARG_WITH([kernel-source], [kernel_source="$with_kernel_source"]) AC_SUBST(kernel_source)
+dnl Add flags for gcc and g++ +if test "x$GCC" = xyes; then + # Enable -fvisibility=hidden if using a gcc that supports it + save_CFLAGS="$CFLAGS" + AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden]) + VISIBILITY_CFLAGS="-fvisibility=hidden" + CFLAGS="$CFLAGS $VISIBILITY_CFLAGS" + AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]), + [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]); + + # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed. + CFLAGS=$save_CFLAGS + + if test "x$VISIBILITY_CFLAGS" != x; then + AC_DEFINE(HAVE_VISIBILITY, 1, [Compiler has -fvisibility support]) + fi + + AC_SUBST([VISIBILITY_CFLAGS]) +fi + AC_SUBST(WARN_CFLAGS) AC_CONFIG_FILES([ Makefile diff --git a/libdrm.h b/libdrm.h new file mode 100644 index 000000000000..23926e6f6741 --- /dev/null +++ b/libdrm.h @@ -0,0 +1,34 @@ +/* + * Copyright © 2014 NVIDIA Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef LIBDRM_LIBDRM_H +#define LIBDRM_LIBDRM_H + +#if defined(HAVE_VISIBILITY) +# define drm_private __attribute__((visibility("hidden"))) +# define drm_public __attribute__((visibility("default"))) +#else +# define drm_private +# define drm_public +#endif + +#endif
On Wed, Jul 30, 2014 at 9:48 AM, Thierry Reding thierry.reding@gmail.com wrote:
From: Thierry Reding treding@nvidia.com
Checks whether or not the compiler supports the -fvisibility option. If so it sets the VISIBILITY_CFLAGS variable which can be added to the per directory AM_CFLAGS where appropriate.
By default all symbols will be hidden via the VISIBILITY_CFLAGS. The drm_public macro can be used to mark symbols that should be exported.
hmm, maybe dumb question, I might possibly have missed some discussion on this, but if we merged this without a heap of patches to export libdrm and libdrm_foo syms, wouldn't everything be hidden?
Maybe we should introduce drm_public first.. then once stuff is converted to use it actually start hiding things?
BR, -R
Signed-off-by: Thierry Reding treding@nvidia.com
Changes in v3:
- distribute libdrm.h
Makefile.am | 1 + configure.ac | 20 ++++++++++++++++++++ libdrm.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 libdrm.h
diff --git a/Makefile.am b/Makefile.am index 826c30d0c0d9..65680da963eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,7 @@ libdrm_la_SOURCES = \ xf86drmSL.c \ xf86drmMode.c \ xf86atomic.h \
libdrm.h \ libdrm_lists.hlibdrmincludedir = ${includedir} diff --git a/configure.ac b/configure.ac index 1c78c4520c49..f7c7177bfb2a 100644 --- a/configure.ac +++ b/configure.ac @@ -366,6 +366,26 @@ AC_ARG_WITH([kernel-source], [kernel_source="$with_kernel_source"]) AC_SUBST(kernel_source)
+dnl Add flags for gcc and g++ +if test "x$GCC" = xyes; then
- # Enable -fvisibility=hidden if using a gcc that supports it
- save_CFLAGS="$CFLAGS"
- AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
- VISIBILITY_CFLAGS="-fvisibility=hidden"
- CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
[VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);- # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.
- CFLAGS=$save_CFLAGS
- if test "x$VISIBILITY_CFLAGS" != x; then
AC_DEFINE(HAVE_VISIBILITY, 1, [Compiler has -fvisibility support])- fi
- AC_SUBST([VISIBILITY_CFLAGS])
+fi
AC_SUBST(WARN_CFLAGS) AC_CONFIG_FILES([ Makefile diff --git a/libdrm.h b/libdrm.h new file mode 100644 index 000000000000..23926e6f6741 --- /dev/null +++ b/libdrm.h @@ -0,0 +1,34 @@ +/*
- Copyright © 2014 NVIDIA Corporation
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
- */
+#ifndef LIBDRM_LIBDRM_H +#define LIBDRM_LIBDRM_H
+#if defined(HAVE_VISIBILITY) +# define drm_private __attribute__((visibility("hidden"))) +# define drm_public __attribute__((visibility("default"))) +#else +# define drm_private +# define drm_public +#endif
+#endif
2.0.3
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
On 30/07/14 15:31, Rob Clark wrote:
On Wed, Jul 30, 2014 at 9:48 AM, Thierry Reding thierry.reding@gmail.com wrote:
From: Thierry Reding treding@nvidia.com
Checks whether or not the compiler supports the -fvisibility option. If so it sets the VISIBILITY_CFLAGS variable which can be added to the per directory AM_CFLAGS where appropriate.
By default all symbols will be hidden via the VISIBILITY_CFLAGS. The drm_public macro can be used to mark symbols that should be exported.
hmm, maybe dumb question, I might possibly have missed some discussion on this, but if we merged this without a heap of patches to export libdrm and libdrm_foo syms, wouldn't everything be hidden?
Maybe we should introduce drm_public first.. then once stuff is converted to use it actually start hiding things?
This adds the tool, but it's up-to the individual libraries/makefiles to make use of it.
All you need is: - append $(VISIBILITY_CFLAGS) to libdrm_freedreno_CFLAGS - prefix each exported function definition with DRM_PUBLIC - *** - profit :P
-Emil
BR, -R
Signed-off-by: Thierry Reding treding@nvidia.com
Changes in v3:
- distribute libdrm.h
Makefile.am | 1 + configure.ac | 20 ++++++++++++++++++++ libdrm.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 libdrm.h
diff --git a/Makefile.am b/Makefile.am index 826c30d0c0d9..65680da963eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,7 @@ libdrm_la_SOURCES = \ xf86drmSL.c \ xf86drmMode.c \ xf86atomic.h \
libdrm.h \ libdrm_lists.hlibdrmincludedir = ${includedir} diff --git a/configure.ac b/configure.ac index 1c78c4520c49..f7c7177bfb2a 100644 --- a/configure.ac +++ b/configure.ac @@ -366,6 +366,26 @@ AC_ARG_WITH([kernel-source], [kernel_source="$with_kernel_source"]) AC_SUBST(kernel_source)
+dnl Add flags for gcc and g++ +if test "x$GCC" = xyes; then
- # Enable -fvisibility=hidden if using a gcc that supports it
- save_CFLAGS="$CFLAGS"
- AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
- VISIBILITY_CFLAGS="-fvisibility=hidden"
- CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
[VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);- # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.
- CFLAGS=$save_CFLAGS
- if test "x$VISIBILITY_CFLAGS" != x; then
AC_DEFINE(HAVE_VISIBILITY, 1, [Compiler has -fvisibility support])- fi
- AC_SUBST([VISIBILITY_CFLAGS])
+fi
AC_SUBST(WARN_CFLAGS) AC_CONFIG_FILES([ Makefile diff --git a/libdrm.h b/libdrm.h new file mode 100644 index 000000000000..23926e6f6741 --- /dev/null +++ b/libdrm.h @@ -0,0 +1,34 @@ +/*
- Copyright © 2014 NVIDIA Corporation
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
- */
+#ifndef LIBDRM_LIBDRM_H +#define LIBDRM_LIBDRM_H
+#if defined(HAVE_VISIBILITY) +# define drm_private __attribute__((visibility("hidden"))) +# define drm_public __attribute__((visibility("default"))) +#else +# define drm_private +# define drm_public +#endif
+#endif
2.0.3
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, Jul 30, 2014 at 10:37 AM, Emil Velikov emil.l.velikov@gmail.com wrote:
On 30/07/14 15:31, Rob Clark wrote:
On Wed, Jul 30, 2014 at 9:48 AM, Thierry Reding thierry.reding@gmail.com wrote:
From: Thierry Reding treding@nvidia.com
Checks whether or not the compiler supports the -fvisibility option. If so it sets the VISIBILITY_CFLAGS variable which can be added to the per directory AM_CFLAGS where appropriate.
By default all symbols will be hidden via the VISIBILITY_CFLAGS. The drm_public macro can be used to mark symbols that should be exported.
hmm, maybe dumb question, I might possibly have missed some discussion on this, but if we merged this without a heap of patches to export libdrm and libdrm_foo syms, wouldn't everything be hidden?
Maybe we should introduce drm_public first.. then once stuff is converted to use it actually start hiding things?
This adds the tool, but it's up-to the individual libraries/makefiles to make use of it.
All you need is:
- append $(VISIBILITY_CFLAGS) to libdrm_freedreno_CFLAGS
- prefix each exported function definition with DRM_PUBLIC
- profit :P
ahh, ok, that makes much more sense.. thx :-)
BR, -R
-Emil
BR, -R
Signed-off-by: Thierry Reding treding@nvidia.com
Changes in v3:
- distribute libdrm.h
Makefile.am | 1 + configure.ac | 20 ++++++++++++++++++++ libdrm.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 libdrm.h
diff --git a/Makefile.am b/Makefile.am index 826c30d0c0d9..65680da963eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,7 @@ libdrm_la_SOURCES = \ xf86drmSL.c \ xf86drmMode.c \ xf86atomic.h \
libdrm.h \ libdrm_lists.hlibdrmincludedir = ${includedir} diff --git a/configure.ac b/configure.ac index 1c78c4520c49..f7c7177bfb2a 100644 --- a/configure.ac +++ b/configure.ac @@ -366,6 +366,26 @@ AC_ARG_WITH([kernel-source], [kernel_source="$with_kernel_source"]) AC_SUBST(kernel_source)
+dnl Add flags for gcc and g++ +if test "x$GCC" = xyes; then
- # Enable -fvisibility=hidden if using a gcc that supports it
- save_CFLAGS="$CFLAGS"
- AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
- VISIBILITY_CFLAGS="-fvisibility=hidden"
- CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
[VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);- # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.
- CFLAGS=$save_CFLAGS
- if test "x$VISIBILITY_CFLAGS" != x; then
AC_DEFINE(HAVE_VISIBILITY, 1, [Compiler has -fvisibility support])- fi
- AC_SUBST([VISIBILITY_CFLAGS])
+fi
AC_SUBST(WARN_CFLAGS) AC_CONFIG_FILES([ Makefile diff --git a/libdrm.h b/libdrm.h new file mode 100644 index 000000000000..23926e6f6741 --- /dev/null +++ b/libdrm.h @@ -0,0 +1,34 @@ +/*
- Copyright © 2014 NVIDIA Corporation
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
- */
+#ifndef LIBDRM_LIBDRM_H +#define LIBDRM_LIBDRM_H
+#if defined(HAVE_VISIBILITY) +# define drm_private __attribute__((visibility("hidden"))) +# define drm_public __attribute__((visibility("default"))) +#else +# define drm_private +# define drm_public +#endif
+#endif
2.0.3
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
On 30/07/14 14:48, Thierry Reding wrote:
From: Thierry Reding treding@nvidia.com
Checks whether or not the compiler supports the -fvisibility option. If so it sets the VISIBILITY_CFLAGS variable which can be added to the per directory AM_CFLAGS where appropriate.
By default all symbols will be hidden via the VISIBILITY_CFLAGS. The drm_public macro can be used to mark symbols that should be exported.
Thank you Thierry. Finally we can cleanup some of the exports that libdrm* erroneously provides :)
Reviewed-by: Emil Velikov emil.l.velikov@gmail.com
Signed-off-by: Thierry Reding treding@nvidia.com
Changes in v3:
- distribute libdrm.h
Makefile.am | 1 + configure.ac | 20 ++++++++++++++++++++ libdrm.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 libdrm.h
diff --git a/Makefile.am b/Makefile.am index 826c30d0c0d9..65680da963eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,7 @@ libdrm_la_SOURCES = \ xf86drmSL.c \ xf86drmMode.c \ xf86atomic.h \
- libdrm.h \ libdrm_lists.h
libdrmincludedir = ${includedir} diff --git a/configure.ac b/configure.ac index 1c78c4520c49..f7c7177bfb2a 100644 --- a/configure.ac +++ b/configure.ac @@ -366,6 +366,26 @@ AC_ARG_WITH([kernel-source], [kernel_source="$with_kernel_source"]) AC_SUBST(kernel_source)
+dnl Add flags for gcc and g++ +if test "x$GCC" = xyes; then
- # Enable -fvisibility=hidden if using a gcc that supports it
- save_CFLAGS="$CFLAGS"
- AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
- VISIBILITY_CFLAGS="-fvisibility=hidden"
- CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
- AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
[VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);- # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.
- CFLAGS=$save_CFLAGS
- if test "x$VISIBILITY_CFLAGS" != x; then
AC_DEFINE(HAVE_VISIBILITY, 1, [Compiler has -fvisibility support])- fi
- AC_SUBST([VISIBILITY_CFLAGS])
+fi
AC_SUBST(WARN_CFLAGS) AC_CONFIG_FILES([ Makefile diff --git a/libdrm.h b/libdrm.h new file mode 100644 index 000000000000..23926e6f6741 --- /dev/null +++ b/libdrm.h @@ -0,0 +1,34 @@ +/*
- Copyright © 2014 NVIDIA Corporation
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
- */
+#ifndef LIBDRM_LIBDRM_H +#define LIBDRM_LIBDRM_H
+#if defined(HAVE_VISIBILITY) +# define drm_private __attribute__((visibility("hidden"))) +# define drm_public __attribute__((visibility("default"))) +#else +# define drm_private +# define drm_public +#endif
+#endif
dri-devel@lists.freedesktop.org
-
Christian König -
Emil Velikov -
Maarten Lankhorst -
Rob Clark -
Thierry Reding