From 1c1f5c180fa8748b74123c28766306c8e2b578f6 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Wed, 16 Mar 2022 17:15:20 +0300
Subject: [PATCH] imported two libtool mainstream commits 28fbcb6a and b55b1cc8

---
 acinclude/libtool.m4    |  2 +-
 build-scripts/ltmain.sh | 16 ++++++++++++++--
 configure               |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/acinclude/libtool.m4 b/acinclude/libtool.m4
index df6496ee7..3236ddab0 100644
--- a/acinclude/libtool.m4
+++ b/acinclude/libtool.m4
@@ -1068,7 +1068,7 @@ _LT_EOF
     darwin1.*)
       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
     darwin*)
-      case ${MACOSX_DEPLOYMENT_TARGET},$host in
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
         10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
           _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
         *)
diff --git a/build-scripts/ltmain.sh b/build-scripts/ltmain.sh
index c10d13d89..70a3e8253 100644
--- a/build-scripts/ltmain.sh
+++ b/build-scripts/ltmain.sh
@@ -7081,8 +7081,20 @@ func_mode_link ()
 	prev=xcompiler
 	continue
 	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+     # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199.
+     -pthread)
+	case $host in
+	  *solaris2*) ;;
+	  *)
+	    case "$new_inherited_linker_flags " in
+	        *" $arg "*) ;;
+	        * ) func_append new_inherited_linker_flags " $arg" ;;
+	    esac
+	  ;;
+	esac
+	continue
+	;;
+      -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \
       |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
diff --git a/configure b/configure
index 54a550c79..df73ab0cb 100755
--- a/configure
+++ b/configure
@@ -7124,7 +7124,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
     darwin1.*)
       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
     darwin*)
-      case ${MACOSX_DEPLOYMENT_TARGET},$host in
+      case $MACOSX_DEPLOYMENT_TARGET,$host in
         10.[012],*|,*powerpc*-darwin[5-8]*)
           _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
         *)