From 762926920aa6b0067443e7c085bddf22d03a1d04 Mon Sep 17 00:00:00 2001
From: Kevin Greenan <kmgreen2@gmail.com>
Date: Mon, 30 Dec 2013 21:26:47 -0800
Subject: Third time's a charm (autoconf non-sense for PCLMUL).

---
 m4/ax_ext.m4  |  4 ++--
 m4/libtool.m4 | 27 +++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'm4')

diff --git a/m4/ax_ext.m4 b/m4/ax_ext.m4
index f2d65b2..f3b184e 100644
--- a/m4/ax_ext.m4
+++ b/m4/ax_ext.m4
@@ -207,9 +207,9 @@ AC_DEFUN([AX_EXT],
       fi
       
       if test "$ax_cv_have_pclmuldq_ext" = yes; then
-        AX_CHECK_COMPILE_FLAG(-mpclmuldq, ax_cv_support_pclmuldq_ext=yes, [])
+        AX_CHECK_COMPILE_FLAG(-mpclmul, ax_cv_support_pclmuldq_ext=yes, [])
         if test x"$ax_cv_support_pclmuldq_ext" = x"yes"; then
-          SIMD_FLAGS="$SIMD_FLAGS -mpclmuldq -DINTEL_SSE4_PCLMUL"
+          SIMD_FLAGS="$SIMD_FLAGS -mpclmul -DINTEL_PCLMUL"
           AC_DEFINE(HAVE_PCLMULDQ,,[Support (PCLMULDQ) Carry-Free Muliplication])
         else
           AC_MSG_WARN([Your processor supports pclmuldq instructions but not your compiler, can you try another compiler?])
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 44e0ecf..828104c 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2684,6 +2684,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3289,7 +3301,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -4101,7 +4113,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4578,6 +4590,9 @@ m4_if([$1], [CXX], [
       ;;
     esac
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
     ;;
@@ -4640,6 +4655,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
   openbsd*)
     with_gnu_ld=no
     ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4861,7 +4879,7 @@ _LT_EOF
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5038,6 +5056,7 @@ _LT_EOF
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -5342,7 +5361,7 @@ _LT_EOF
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
-- 
cgit v1.2.1