From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Wed, 21 Mar 2018 17:39:16 +0000 (+0000)
Subject: Enable jit on Solaris: soname option and EXTRA_GCC_LIBS (PR jit/84288)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ea143da7fbc3c8507e62d86c816d56a2013e590f;p=gcc.git

Enable jit on Solaris: soname option and EXTRA_GCC_LIBS (PR jit/84288)

	gcc/jit:
	PR jit/84288
	* Make-lang.in ($(LIBGCCJIT_FILENAME)): Add $(EXTRA_GCC_LIBS).

	gcc:
	PR jit/84288
	* configure.ac (gcc_cv_ld_soname) <*-*-solaris2*>: Set.
	* configure: Regenerate.

From-SVN: r258727
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8c70daa323f..17cad379d90 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR jit/84288
+	* configure.ac (gcc_cv_ld_soname) <*-*-solaris2*>: Set.
+	* configure: Regenerate.
+
 2018-03-21  Tom de Vries  <tom@codesourcery.com>
 
 	PR tree-optimization/83126
diff --git a/gcc/configure b/gcc/configure
index c2d3f752347..7fe7efe8bb4 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -24490,6 +24490,12 @@ elif test x$gcc_cv_ld != x; then
       gcc_cv_ld_soname=yes
       ld_soname_option='-install_name'
       ;;
+    # Solaris 2 ld always supports -h.  It also supports --soname for GNU
+    # ld compatiblity since some Solaris 10 update.
+    *-*-solaris2*)
+      gcc_cv_ld_soname=yes
+      ld_soname_option='-h'
+      ;;
   esac
 fi
 # Don't AC_DEFINE result, only used in jit/Make-lang.in so far.
diff --git a/gcc/configure.ac b/gcc/configure.ac
index c3c76acd081..67e1682ad66 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -3687,6 +3687,12 @@ elif test x$gcc_cv_ld != x; then
       gcc_cv_ld_soname=yes
       ld_soname_option='-install_name'
       ;;
+    # Solaris 2 ld always supports -h.  It also supports --soname for GNU
+    # ld compatiblity since some Solaris 10 update.
+    *-*-solaris2*)
+      gcc_cv_ld_soname=yes
+      ld_soname_option='-h'
+      ;;
   esac
 fi
 # Don't AC_DEFINE result, only used in jit/Make-lang.in so far.
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog
index 8ae54f93f84..6e279f7d057 100644
--- a/gcc/jit/ChangeLog
+++ b/gcc/jit/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR jit/84288
+	* Make-lang.in ($(LIBGCCJIT_FILENAME)): Add $(EXTRA_GCC_LIBS).
+
 2018-03-09  David Malcolm  <dmalcolm@redhat.com>
 	    Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
diff --git a/gcc/jit/Make-lang.in b/gcc/jit/Make-lang.in
index ba78f8ecaf3..280c094e9f2 100644
--- a/gcc/jit/Make-lang.in
+++ b/gcc/jit/Make-lang.in
@@ -96,7 +96,7 @@ $(LIBGCCJIT_FILENAME): $(jit_OBJS) \
 	$(EXTRA_GCC_OBJS)
 	+$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ -shared \
 	     $(jit_OBJS) libbackend.a libcommon-target.a libcommon.a \
-	     $(CPPLIB) $(LIBDECNUMBER) $(LIBS) $(BACKENDLIBS) \
+	     $(CPPLIB) $(LIBDECNUMBER) $(EXTRA_GCC_LIBS) $(LIBS) $(BACKENDLIBS) \
 	     $(EXTRA_GCC_OBJS) \
 	     $(LIBGCCJIT_VERSION_SCRIPT_OPTION) \
 	     $(LIBGCCJIT_SONAME_OPTION)