[patch] patch for Gentoo/FreeBSD.

gfbsd.patch (text/plain), 2.81 KB, created by Yuta SATOH on 2013-08-31 11:04:38 UTC

diff --git a/binutils-2.23.2/gold/configure.ac b/binutils-2.23.2/gold/configure.ac
index 25ecbd8..eeec21f 100644
--- a/binutils-2.23.2/gold/configure.ac
+++ b/binutils-2.23.2/gold/configure.ac
@@ -503,7 +503,8 @@ AC_CHECK_HEADERS(byteswap.h)
 dnl When plugins enabled dynamic loader interface is required. Check headers
 dnl which may provide this interface. In case of dlfcn.h add libdl to link.
 AC_CHECK_HEADERS(windows.h)
-AC_CHECK_HEADERS(dlfcn.h, [DLOPEN_LIBS="-ldl"], [DLOPEN_LIBS=""])
+AC_CHECK_HEADERS(dlfcn.h)
+AC_SEARCH_LIBS([dlopen], [dl], [test "$ac_cv_search_dlopen" = "none required" || DLOPEN_LIBS="-ldl"], [DLOPEN_LIBS=""])
 AC_SUBST(DLOPEN_LIBS)
 
 AC_CHECK_FUNCS(mallinfo posix_fallocate fallocate readv sysconf times)
diff --git a/binutils-2.23.2/gold/configure b/binutils-2.23.2/gold/configure
index f8707d2..b74e081 100755
--- a/binutils-2.23.2/gold/configure
+++ b/binutils-2.23.2/gold/configure
@@ -7162,17 +7063,73 @@ done
 for ac_header in dlfcn.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DLFCN_H 1
 _ACEOF
- DLOPEN_LIBS="-ldl"
-else
-  DLOPEN_LIBS=""
+
 fi

 done

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+$as_echo_n "checking for library containing dlopen... " >&6; }
+if ${ac_cv_search_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' dl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_search_dlopen=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_dlopen+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_dlopen+:} false; then :
+
+else
+  ac_cv_search_dlopen=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
+ac_res=$ac_cv_search_dlopen
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  test "$ac_cv_search_dlopen" = "none required" || DLOPEN_LIBS="-ldl"
+else
+  DLOPEN_LIBS=""
+fi
+


 for ac_func in mallinfo posix_fallocate fallocate readv sysconf times