From 6eea292727c2b47ed17fc5fa1ed09725eaed7948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Hinderer?= <Sebastien.Hinderer@inria.fr>
Date: Thu, 25 Oct 2018 15:12:22 +0200
Subject: [PATCH] Remove the dl_needs_underscore feature (#2115)

This feature could not be enabled anyway
---
 configure      | 5 -----
 runtime/unix.c | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/configure b/configure
index a39fdf8ebb86..497a3115aa89 100755
--- a/configure
+++ b/configure
@@ -762,7 +762,6 @@ esac
 # Shared library support
 
 shared_libraries_supported=false
-dl_needs_underscore=false
 sharedlib_cflags=''
 mksharedlib='shared-libs-not-available'
 rpath=''
@@ -783,7 +782,6 @@ if $with_sharedlibs; then
       mksharedlib="$cc -shared -flat_namespace -undefined suppress \
                    -Wl,-no_compact_unwind"
       common_cflags="$dl_defs $common_cflags"
-      dl_needs_underscore=false
       shared_libraries_supported=true;;
     *-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
     |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*)
@@ -1396,9 +1394,6 @@ fi
 if $shared_libraries_supported; then
   inf "Dynamic loading of shared libraries is supported."
   echo "#define SUPPORT_DYNAMIC_LINKING" >> s.h
-  if $dl_needs_underscore; then
-    echo '#define DL_NEEDS_UNDERSCORE' >>s.h
-  fi
 fi
 
 if sh ./hasgot -i sys/types.h -i sys/mman.h && sh ./hasgot mmap munmap; then
diff --git a/runtime/unix.c b/runtime/unix.c
index 695409d76d48..c0ddbaaaf81c 100644
--- a/runtime/unix.c
+++ b/runtime/unix.c
@@ -286,11 +286,6 @@ void caml_dlclose(void * handle)
 
 void * caml_dlsym(void * handle, const char * name)
 {
-#ifdef DL_NEEDS_UNDERSCORE
-  char _name[1000] = "_";
-  strncat (_name, name, 998);
-  name = _name;
-#endif
   return dlsym(handle, name);
 }