Merge pull request #72 from evelikov/remove-elf-filtering

4 files changed, 2 insertions, 53 deletions

diff --git a/configure.ac b/configure.ac
index cc1a110..b2ba9f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,39 +37,6 @@ if test "x$ac_cv_prog_cc_c99" = xno; then
 fi
 
 dnl
-dnl Auxiliary ELF symbol filtering support
-dnl
-AC_ARG_ENABLE([dt-auxiliary],
-    [AS_HELP_STRING([--enable-dt-auxiliary],
-    [enable auxiliary ELF symbol filtering @<:@default=disabled@:>@])],
-    [enable_dt_auxiliary="$enableval"],
-    [enable_dt_auxiliary=no]
-)
-AC_MSG_CHECKING([whether to enable auxiliary ELF symbol filtering])
-
-if test "x$enable_dt_auxiliary" = xyes; then
-    (
-        _SAVE_LDFLAGS="$LDFLAGS"
-        LDFLAGS='-shared -Wl,--auxiliary=libc.so.6'
-        AC_LINK_IFELSE([AC_LANG_SOURCE([])],
-                        [dt_auxiliary_supported=yes],
-                        [dt_auxiliary_supported=no])
-        if test "x$dt_auxiliary_supported" = xyes; then
-            AC_MSG_RESULT([yes, supported])
-        else
-            AC_MSG_RESULT([no, not supported])
-        fi
-        test "x$dt_auxiliary_supported" = xyes
-        LDFLAGS ="$_SAVE_LDFLAGS"
-    ) && dt_auxiliary_supported=yes
-else
-    dt_auxiliary_supported=no
-    AC_MSG_RESULT([no])
-fi
-
-AM_CONDITIONAL([USE_DT_AUXILIARY], [test "x$dt_auxiliary_supported" = xyes])
-
-dnl
 dnl Arch/platform-specific settings. Copied from mesa
 dnl
 AC_ARG_ENABLE([asm],
diff --git a/src/GL/Makefile.am b/src/GL/Makefile.am
index 93415e0..35bce96 100644
--- a/src/GL/Makefile.am
+++ b/src/GL/Makefile.am
@@ -57,15 +57,7 @@ g_libglglxwrapper.c : $(glapi_gen_libglglxstubs_deps)
 libGL_la_CFLAGS = \
 	-I$(top_srcdir)/include
 
-if USE_DT_AUXILIARY
-# XXX: libtool has trouble processing "-Wl,*" options, so we use -Xlinker here
-# instead.
-DT_AUX_FLAGS = -Xlinker "--auxiliary=libGLX.so.0" -Xlinker "--auxiliary=libGLdispatch.so.0"
-else
-DT_AUX_FLAGS =
-endif
-
-libGL_la_LDFLAGS = -shared -version-info 1 $(LINKER_FLAG_NO_UNDEFINED) $(DT_AUX_FLAGS)
+libGL_la_LDFLAGS = -shared -version-info 1 $(LINKER_FLAG_NO_UNDEFINED)
 
 AM_CPPFLAGS = \
 	-I$(TOP)/src/GLdispatch/vnd-glapi/mapi \
diff --git a/src/GLdispatch/Makefile.am b/src/GLdispatch/Makefile.am
index 3fcd996..9109d35 100644
--- a/src/GLdispatch/Makefile.am
+++ b/src/GLdispatch/Makefile.am
@@ -41,12 +41,9 @@ libGLdispatch_la_CFLAGS += -I$(top_srcdir)/include
 
 libGLdispatch_la_LDFLAGS = -shared -version-info 0 $(LINKER_FLAG_NO_UNDEFINED)
 
-if USE_DT_AUXILIARY
-else
 EXTRA_libGLdispatch_la_DEPENDENCIES = $(top_srcdir)/src/GLdispatch/export_list.sym
 libGLdispatch_la_LDFLAGS += \
 	-export-symbols $(top_srcdir)/src/GLdispatch/export_list.sym
-endif
 
 libGLdispatch_la_SOURCES = \
 	$(top_srcdir)/src/util/glvnd_pthread.c \
diff --git a/src/OpenGL/entrypoint_common.mk b/src/OpenGL/entrypoint_common.mk
index e88e8a0..2e36685 100644
--- a/src/OpenGL/entrypoint_common.mk
+++ b/src/OpenGL/entrypoint_common.mk
@@ -63,12 +63,6 @@ g_glapi_mapi_$(ENTRYPOINT_TARGET)_tmp.h : $(glapi_gen_mapi_deps)
 g_$(ENTRYPOINT_TARGET)_exports.sym : $(glapi_gen_libopengl_exports_deps)
 	$(call glapi_gen_libopengl_exports, $(ENTRYPOINT_TARGET))
 
-if USE_DT_AUXILIARY
-DT_AUX_FLAGS = -Xlinker "--auxiliary=libGLdispatch.so.0"
-else
-DT_AUX_FLAGS =
-endif
-
 ENTRYPOINT_COMMON_CFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/GLdispatch/vnd-glapi/mapi \
@@ -82,8 +76,7 @@ ENTRYPOINT_COMMON_DEPENDENCIES = $(builddir)/g_$(ENTRYPOINT_TARGET)_exports.sym
 
 ENTRYPOINT_COMMON_LDFLAGS = -shared \
 	$(LINKER_FLAG_NO_UNDEFINED) \
-	-export-symbols $(builddir)/g_$(ENTRYPOINT_TARGET)_exports.sym \
-	$(DT_AUX_FLAGS)
+	-export-symbols $(builddir)/g_$(ENTRYPOINT_TARGET)_exports.sym
 
 ENTRYPOINT_COMMON_LIBADD = ../GLdispatch/libGLdispatch.la