1 files changed, 8 insertions, 0 deletions
diff --git a/gcc/configure b/gcc/configure
index ee300a87d98..ff3c6e63c03 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -23567,6 +23567,14 @@ fi
 $as_echo "$gcc_cv_as_shf_merge" >&6; }
 
 fi
+case "$target" in
+  i?86-*-solaris2.10* | x86_64-*-solaris2.10*)
+    # SHF_MERGE support in Solaris 10/x86 ld is broken.
+    if test x"$gnu_ld" = xno; then
+      gcc_cv_as_shf_merge=no
+    fi
+    ;;
+esac
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_GAS_SHF_MERGE `if test $gcc_cv_as_shf_merge = yes; then echo 1; else echo 0; fi`